diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index 162cda1eff..cab1e8c7a2 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -340,7 +340,7 @@
 	Voiced:
 		VoiceSet: Vehicle
 	TargetableUnit:
-		TargetTypes: Ground, Vehicle
+		TargetTypes: Ground, Vehicle, Repair
 	Repairable:
 		RepairBuildings: gadept
 		Voice: Move
diff --git a/mods/ts/rules/nod-support.yaml b/mods/ts/rules/nod-support.yaml
index 3caac8c883..22a440739b 100644
--- a/mods/ts/rules/nod-support.yaml
+++ b/mods/ts/rules/nod-support.yaml
@@ -218,7 +218,7 @@ GATICK:
 		Palette: pips
 	Selectable:
 	TargetableBuilding:
-		TargetTypes: Ground
+		TargetTypes: Ground, Repair
 	Guardable:
 	HiddenUnderFog:
 	ActorLostNotification:
@@ -276,7 +276,7 @@ GAARTY:
 		Palette: pips
 	Selectable:
 	TargetableBuilding:
-		TargetTypes: Ground
+		TargetTypes: Ground, Repair
 	Guardable:
 	HiddenUnderFog:
 	ActorLostNotification:
diff --git a/mods/ts/rules/shared-support.yaml b/mods/ts/rules/shared-support.yaml
index 1af6b044dc..db5f3c764e 100644
--- a/mods/ts/rules/shared-support.yaml
+++ b/mods/ts/rules/shared-support.yaml
@@ -33,7 +33,7 @@ GADPSA:
 		Palette: pips
 	Selectable:
 	TargetableBuilding:
-		TargetTypes: Ground
+		TargetTypes: Ground, Repair
 	Guardable:
 	HiddenUnderFog:
 	ActorLostNotification:
diff --git a/mods/ts/weapons/healweapons.yaml b/mods/ts/weapons/healweapons.yaml
index fc6531d84d..8eac8c8656 100644
--- a/mods/ts/weapons/healweapons.yaml
+++ b/mods/ts/weapons/healweapons.yaml
@@ -17,17 +17,13 @@ Repair:
 	ReloadDelay: 80
 	Range: 1c819
 	Report: REPAIR11.AUD
+	ValidTargets: Repair
 	Projectile: Bullet
 		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
 		Spread: 213
 		Damage: -50
-		Versus:
-			None: 0
-			Wood: 0
-			Light: 100
-			Heavy: 100
-			Concrete: 0
+		ValidTargets: Repair
 
 TiberiumHeal:
 	ReloadDelay: 16