diff --git a/mods/ra/weapons/ballistics.yaml b/mods/ra/weapons/ballistics.yaml
index 246e1004f0..8d8d2c1045 100644
--- a/mods/ra/weapons/ballistics.yaml
+++ b/mods/ra/weapons/ballistics.yaml
@@ -21,11 +21,12 @@
 	Warhead@3Eff: CreateEffect
 		Explosions: small_explosion
 		ImpactSounds: kaboom12.aud
-		InvalidImpactTypes: Water
+		ValidTargets: Ground, Ship
 	Warhead@4EffWater: CreateEffect
 		Explosions: small_splash
 		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
+		ValidTargets: Water, Underwater
+		InvalidTargets: Ship, Structure
 
 25mm:
 	Inherits: ^Cannon
@@ -139,6 +140,7 @@ TurretGun:
 	ReloadDelay: 60
 	Range: 5c512
 	Report: cannon2.aud
+	InvalidTargets: Underwater
 	Projectile: Bullet
 		Speed: 426
 	Warhead@1Dam: SpreadDamage
@@ -183,7 +185,8 @@ DepthCharge:
 	Warhead@1Dam: SpreadDamage
 		Spread: 128
 		Damage: 80
-		ValidTargets: Underwater
+		ValidTargets: Underwater, Water
+		InvalidTargets: Ship
 		Versus:
 			None: 30
 			Wood: 75
@@ -194,8 +197,8 @@ DepthCharge:
 	Warhead@4EffWater: CreateEffect
 		Explosions: large_splash
 		ImpactSounds: h2obomb2.aud
-		ValidImpactTypes: Water, WaterHit
+		ValidTargets: Water, Underwater
 	Warhead@3Eff: CreateEffect
 		Explosions: small_explosion
 		ImpactSounds: kaboom15.aud
-		ValidImpactTypes: WaterHit
+		ValidTargets: Underwater