diff --git a/OpenRA.Mods.Common/Activities/Resupply.cs b/OpenRA.Mods.Common/Activities/Resupply.cs
index 1470c6ee04..b42ddfb40e 100644
--- a/OpenRA.Mods.Common/Activities/Resupply.cs
+++ b/OpenRA.Mods.Common/Activities/Resupply.cs
@@ -127,7 +127,7 @@ namespace OpenRA.Mods.Common.Activities
 				// HACK: Repairable needs the actor to move to host center.
 				// TODO: Get rid of this or at least replace it with something less hacky.
 				if (repairableNear == null)
-					QueueChild(move.MoveTo(targetCell, ignoreActor: host.Actor));
+					QueueChild(move.MoveTo(targetCell));
 
 				var delta = (self.CenterPosition - host.CenterPosition).LengthSquared;
 				var transport = transportCallers.FirstOrDefault(t => t.MinimumDistance.LengthSquared < delta);
diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml
index b3de8cc1c5..fcdd384886 100644
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -678,7 +678,7 @@ FIX:
 		Queue: Building.GDI, Building.Nod
 		Description: Repairs vehicles
 	Building:
-		Footprint: _X_ xxx _X_
+		Footprint: _=_ === _=_
 		Dimensions: 3,3
 	Selectable:
 		Bounds: 64,34,0,3
diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml
index 8303bc6f54..6df4130e10 100644
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -881,7 +881,7 @@ repair_pad:
 	Tooltip:
 		Name: Repair Pad
 	Building:
-		Footprint: =x= xxx =x=
+		Footprint: === === ===
 		Dimensions: 3,3
 	Health:
 		HP: 30000
diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml
index 1a02664012..454a4fa7d2 100644
--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -1989,7 +1989,7 @@ FIX:
 	Tooltip:
 		Name: Service Depot
 	Building:
-		Footprint: _=_ xxx _=_
+		Footprint: _=_ === _=_
 		Dimensions: 3,3
 	Selectable:
 		Bounds: 68,34,0,3
diff --git a/mods/ts/rules/gdi-structures.yaml b/mods/ts/rules/gdi-structures.yaml
index 963fb47963..a1f4d1f07d 100644
--- a/mods/ts/rules/gdi-structures.yaml
+++ b/mods/ts/rules/gdi-structures.yaml
@@ -320,7 +320,7 @@ GADEPT:
 		Queue: Building
 		Description: Repairs vehicles.
 	Building:
-		Footprint: =x= xxx =x=
+		Footprint: === x== x==
 		Dimensions: 3,3
 	Selectable:
 		Bounds: 96, 64, -6, -6