diff --git a/OpenRA.Mods.RA/DisableUpgrade.cs b/OpenRA.Mods.RA/DisableUpgrade.cs
index b500518323..aa2b0b4948 100644
--- a/OpenRA.Mods.RA/DisableUpgrade.cs
+++ b/OpenRA.Mods.RA/DisableUpgrade.cs
@@ -22,7 +22,7 @@ namespace OpenRA.Mods.RA
 		public object Create(ActorInitializer init) { return new DisableUpgrade(this); }
 	}
 
-	public class DisableUpgrade : IUpgradable, IDisable
+	public class DisableUpgrade : IUpgradable, IDisable, IDisableMove
 	{
 		readonly DisableUpgradeInfo info;
 		bool enabled;
@@ -44,5 +44,7 @@ namespace OpenRA.Mods.RA
 		}
 
 		public bool Disabled { get { return enabled; } }
+
+		public bool MoveDisabled(Actor self) { return enabled; }
 	}
 }
diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index ab217777a8..690fe2b8b5 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -5,7 +5,7 @@
 	Selectable:
 		Priority: 3
 	TargetableBuilding:
-		TargetTypes: Ground, C4
+		TargetTypes: Ground, Building, C4
 	Building:
 		Dimensions: 1,1
 		Footprint: x
@@ -70,7 +70,7 @@
 	LineBuildNode:
 		Types: wall
 	TargetableBuilding:
-		TargetTypes: Ground, C4
+		TargetTypes: Ground, Wall, C4
 	RenderBuildingWall:
 		Type: wall
 	GivesExperience:
@@ -116,7 +116,7 @@
 	Selectable:
 		Voice: Infantry
 	TargetableUnit:
-		TargetTypes: Ground
+		TargetTypes: Ground, Infantry
 	RenderInfantry:
 	WithDeathAnimation:
 	AutoTarget:
@@ -217,7 +217,7 @@
 	Selectable:
 		Voice: Vehicle
 	TargetableUnit:
-		TargetTypes: Ground
+		TargetTypes: Ground, Vehicle
 	Repairable:
 		RepairBuildings: gadept
 	Passenger:
@@ -289,7 +289,7 @@
 	Selectable:
 		Voice: Vehicle
 	TargetableUnit:
-		TargetTypes: Ground
+		TargetTypes: Ground, Vehicle
 	Repairable:
 		RepairBuildings: gadept
 	Passenger:
diff --git a/mods/ts/weapons.yaml b/mods/ts/weapons.yaml
index 6234cddebe..f097d8db37 100644
--- a/mods/ts/weapons.yaml
+++ b/mods/ts/weapons.yaml
@@ -1130,10 +1130,13 @@ EMPulseCannon:
 	Warhead@target: SpreadDamage
 		Spread: 0
 		Damage: 0
+		PreventProne: true
+		ValidTargets: Vehicle
 	Warhead@emp: GrantUpgrade
 		Range: 3c0
 		Duration: 250
 		Upgrades: empdisable
+		ValidTargets: Vehicle
 
 TiberiumExplosion:
 	Warhead@1Dam: SpreadDamage