diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index f75ef1e709..51861cb31c 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -337,7 +337,7 @@
 		Bounds: 24,24
 	TargetableAircraft:
 		TargetTypes: Air
-		GroundedTargetTypes: Ground, Repair
+		GroundedTargetTypes: Ground, Repair, Vehicle
 	HiddenUnderFog:
 		Type: CenterPosition
 	AttackMove:
@@ -449,7 +449,7 @@
 	LineBuildNode:
 		Types: wall
 	TargetableBuilding:
-		TargetTypes: Ground, DetonateAttack
+		TargetTypes: Ground, DetonateAttack, Wall
 	RenderBuildingWall:
 		Palette: effect
 	GivesExperience:
@@ -580,7 +580,7 @@
 		ForceHealthPercentage: 25
 	DisabledOverlay:
 	TargetableUnit:
-		TargetTypes: Ground
+		TargetTypes: Ground, Husk
 		RequiresForceFire: true
 	Chronoshiftable:
 	Tooltip:
diff --git a/mods/ra/weapons/missiles.yaml b/mods/ra/weapons/missiles.yaml
index bdf24bab80..3194d04db4 100644
--- a/mods/ra/weapons/missiles.yaml
+++ b/mods/ra/weapons/missiles.yaml
@@ -208,10 +208,8 @@ Nike:
 		ValidTargets: Air
 		Versus:
 			None: 90
-			Wood: 0
 			Light: 90
 			Heavy: 50
-			Concrete: 0
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
diff --git a/mods/ra/weapons/other.yaml b/mods/ra/weapons/other.yaml
index 4d516fc3dd..69f05d3dc8 100644
--- a/mods/ra/weapons/other.yaml
+++ b/mods/ra/weapons/other.yaml
@@ -186,27 +186,19 @@ DogJaw:
 		Spread: 213
 		Damage: 100
 		ValidTargets: Infantry
-		Versus:
-			Wood: 0
-			Light: 0
-			Heavy: 0
-			Concrete: 0
 		DamageTypes: DefaultDeath
 
 Heal:
 	ReloadDelay: 80
 	Range: 4c0
 	Report: HEAL2.AUD
+	ValidTargets: Infantry
 	Projectile: Bullet
 		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
 		Spread: 213
 		Damage: -50
-		Versus:
-			Wood: 0
-			Light: 0
-			Heavy: 0
-			Concrete: 0
+		ValidTargets: Infantry
 
 Repair:
 	ReloadDelay: 80
@@ -219,12 +211,6 @@ Repair:
 		Spread: 213
 		Damage: -20
 		ValidTargets: Repair
-		Versus:
-			None: 0
-			Wood: 0
-			Light: 100
-			Heavy: 100
-			Concrete: 0
 
 Crush:
 	Warhead@1Dam: SpreadDamage
@@ -273,22 +259,18 @@ Mandible:
 		DamageTypes: Prone50Percent, TriggerProne, DefaultDeath
 
 MADTankThump:
-	InvalidTargets: MADTank
+	InvalidTargets: MADTank, Infantry
 	Warhead@1Dam: HealthPercentageDamage
 		Spread: 7c0
 		Damage: 1
-		InvalidTargets: MADTank
-		Versus:
-			None: 0
+		InvalidTargets: MADTank, Infantry
 
 MADTankDetonate:
-	InvalidTargets: MADTank
+	InvalidTargets: MADTank, Infantry
 	Warhead@1Dam: HealthPercentageDamage
 		Spread: 7c0
 		Damage: 19
-		InvalidTargets: MADTank
-		Versus:
-			None: 0
+		InvalidTargets: MADTank, Infantry
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 		Size: 7,6
diff --git a/mods/ra/weapons/smallcaliber.yaml b/mods/ra/weapons/smallcaliber.yaml
index b0d35000e9..a1c865533a 100644
--- a/mods/ra/weapons/smallcaliber.yaml
+++ b/mods/ra/weapons/smallcaliber.yaml
@@ -2,17 +2,14 @@ Colt45:
 	ReloadDelay: 5
 	Range: 7c0
 	Report: GUN5.AUD
+	ValidTargets: Ground, Infantry
+	InvalidTargets: Vehicle, Tank, Water, Structure, Wall, Husk
 	Projectile: Bullet
 		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
 		Spread: 42
 		Damage: 50
-		Versus:
-			None: 100
-			Wood: 0
-			Light: 0
-			Heavy: 0
-			Concrete: 0
+		ValidTargets: Infantry
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
 		Explosion: piff
@@ -282,16 +279,14 @@ SilencedPPK:
 	ReloadDelay: 80
 	Range: 2c512
 	Report: silppk.aud
+	ValidTargets: Ground, Infantry
+	InvalidTargets: Vehicle, Tank, Water, Structure, Wall, Husk
 	Projectile: Bullet
 		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
 		Spread: 128
 		Damage: 150
-		Versus:
-			Wood: 0
-			Light: 0
-			Heavy: 0
-			Concrete: 0
+		ValidTargets: Infantry
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
 		Explosion: piffs
@@ -333,16 +328,13 @@ Sniper:
 	Report: GUN5.AUD
 	ReloadDelay: 70
 	Range: 10c0
+	ValidTargets: Ground, Infantry
+	InvalidTargets: Vehicle, Tank, Water, Structure, Wall, Husk
 	Projectile: Bullet
 		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
 		Spread: 42
 		Damage: 140
-		Versus:
-			None: 100
-			Wood: 0
-			Light: 0
-			Heavy: 0
-			Concrete: 0
+		ValidTargets: Infantry
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath