diff --git a/mods/ra/weapons/explosions.yaml b/mods/ra/weapons/explosions.yaml
index ed4abf74ef..06f4a68be3 100644
--- a/mods/ra/weapons/explosions.yaml
+++ b/mods/ra/weapons/explosions.yaml
@@ -1,4 +1,5 @@
 ^Explosion:
+	ValidTargets: Ground, Water, Air
 	Warhead@1Dam: SpreadDamage
 		Spread: 426
 		Damage: 50
@@ -15,11 +16,12 @@
 	Warhead@2Eff: CreateEffect
 		Explosions: self_destruct
 		ImpactSounds: kaboom22.aud
-		InvalidImpactTypes: Water
+		ValidTargets: Ground, Air, Ship
 	Warhead@3EffWater: CreateEffect
 		Explosions: large_splash
 		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
+		ValidTargets: Water, Underwater
+		InvalidTargets: Ship, Structure
 
 CrateNapalm:
 	Inherits: ^Explosion
@@ -37,7 +39,7 @@ CrateNapalm:
 	Warhead@2Eff: CreateEffect
 		Explosions: napalm
 		ImpactSounds: firebl3.aud
-		InvalidImpactTypes: None
+		ValidTargets: Ground, Water, Air
 	-Warhead@3EffWater: CreateEffect
 	Warhead@Smu: LeaveSmudge
 		SmudgeType: Scorch
@@ -48,7 +50,7 @@ CrateExplosion:
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
 		AffectsParent: true
 	Warhead@2Eff: CreateEffect
-		InvalidImpactTypes: None
+		ValidTargets: Ground, Water, Air
 	-Warhead@3EffWater: CreateEffect
 
 UnitExplode:
@@ -62,7 +64,7 @@ UnitExplodeShip:
 	Warhead@2Eff: CreateEffect
 		Explosions: building
 		ImpactSounds: kaboom25.aud
-		InvalidImpactTypes: None
+		ValidTargets: Ground, Water
 
 UnitExplodeSubmarine:
 	Inherits: ^Explosion
@@ -70,7 +72,7 @@ UnitExplodeSubmarine:
 	Warhead@2Eff: CreateEffect
 		Explosions: large_splash
 		ImpactSounds: splash9.aud
-		InvalidImpactTypes: None
+		ValidTargets: Ground, Water
 
 UnitExplodeSmall:
 	Inherits: ^Explosion
@@ -127,7 +129,6 @@ BarrelExplode:
 		Explosions: napalm
 		ImpactSounds: firebl3.aud
 		Delay: 5
-		InvalidImpactTypes: None
 	-Warhead@3EffWater: CreateEffect
 	Warhead@Smu: LeaveSmudge
 		SmudgeType: Scorch
diff --git a/mods/ra/weapons/superweapons.yaml b/mods/ra/weapons/superweapons.yaml
index 88b2f0b0ca..33863f53a0 100644
--- a/mods/ra/weapons/superweapons.yaml
+++ b/mods/ra/weapons/superweapons.yaml
@@ -23,11 +23,12 @@ ParaBomb:
 	Warhead@3Eff: CreateEffect
 		Explosions: artillery_explosion
 		ImpactSounds: kaboom15.aud
-		InvalidImpactTypes: Water
+		ValidTargets: Ground, Ship
 	Warhead@4EffWater: CreateEffect
 		Explosions: small_splash
 		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
+		ValidTargets: Water, Underwater
+		InvalidTargets: Ship, Structure
 
 Atomic:
 	ValidTargets: Ground, Trees, Water, Underwater, Air