diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml
index b2a1b4383c..959ca7b8cd 100644
--- a/mods/ra/maps/fort-lonestar/map.yaml
+++ b/mods/ra/maps/fort-lonestar/map.yaml
@@ -790,7 +790,7 @@ Weapons:
 		Range: 10c0
 		Report: MISSILE6.AUD
 		Burst: 2
-		ValidTargets: Ground, Air, Enemy, Neutral, Ally
+		ValidTargets: Ground, Air
 		Projectile: Missile
 			Speed: 128
 			Arm: 2
@@ -805,6 +805,7 @@ Weapons:
 			RangeLimit: 80
 		Warhead: SpreadDamage
 			Spread: 640
+			ValidTargets: Ground, Air
 			Versus:
 				None: 125%
 				Wood: 110%
@@ -822,7 +823,7 @@ Weapons:
 		ROF: 40
 		Range: 8c0
 		Report: AACANON3.AUD
-		ValidTargets: Ground, Enemy, Neutral, Ally
+		ValidTargets: Ground
 		Burst: 6
 		BurstDelay: 1
 		Projectile: Bullet
@@ -833,6 +834,7 @@ Weapons:
 			ContrailLength: 2
 		Warhead: SpreadDamage
 			Spread: 341
+			ValidTargets: Ground
 			Versus:
 				None: 90%
 				Wood: 170%
@@ -902,12 +904,13 @@ Weapons:
 		ROF: 10
 		Range: 8c0
 		Report: AACANON3.AUD
-		ValidTargets: Air, Ground, Enemy, Neutral, Ally
+		ValidTargets: Air, Ground
 		Projectile: Bullet
 			Speed: 1c682
 			High: true
 		Warhead: SpreadDamage
 			Spread: 213
+			ValidTargets: Air, Ground
 			Versus:
 				None: 35%
 				Wood: 30%
diff --git a/mods/ra/maps/training-camp/map.yaml b/mods/ra/maps/training-camp/map.yaml
index b1cde04edd..e8e6c4c204 100644
--- a/mods/ra/maps/training-camp/map.yaml
+++ b/mods/ra/maps/training-camp/map.yaml
@@ -1076,8 +1076,7 @@ VoxelSequences:
 
 Weapons:
 	CrateNuke:
-		Warhead@areanuke2: SpreadDamage
-			DamageModel: PerCell
+		Warhead@areanuke2: PerCellDamage
 			Damage: 250
 			Size: 4
 			Versus:
@@ -1098,8 +1097,7 @@ Weapons:
 		Warhead@areanuke2Eff: CreateEffect
 			ImpactSound: kaboom22
 			Delay: 12
-		Warhead@areanuke3: SpreadDamage
-			DamageModel: PerCell
+		Warhead@areanuke3: PerCellDamage
 			Damage: 250
 			Size: 3
 			Versus:
@@ -1120,8 +1118,7 @@ Weapons:
 		Warhead@areanuke3Eff: CreateEffect
 			ImpactSound: kaboom22
 			Delay: 24
-		Warhead@areanuke4: SpreadDamage
-			DamageModel: PerCell
+		Warhead@areanuke4: PerCellDamage
 			Damage: 250
 			Versus:
 				None: 90%