diff --git a/mods/cnc/maps/gdi04a/weapons.yaml b/mods/cnc/maps/gdi04a/weapons.yaml
deleted file mode 100644
index 2db4e08279..0000000000
--- a/mods/cnc/maps/gdi04a/weapons.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-Tiberium:
-	Warhead@1Dam: SpreadDamage
-		Damage: 600
diff --git a/mods/cnc/maps/gdi04b/weapons.yaml b/mods/cnc/maps/gdi04b/weapons.yaml
deleted file mode 100644
index 63cd0a0ee8..0000000000
--- a/mods/cnc/maps/gdi04b/weapons.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-Tiberium:
-	Warhead@1Dam: SpreadDamage
-		Damage: 400
diff --git a/mods/cnc/maps/gdi05a/weapons.yaml b/mods/cnc/maps/gdi05a/weapons.yaml
deleted file mode 100644
index 63cd0a0ee8..0000000000
--- a/mods/cnc/maps/gdi05a/weapons.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-Tiberium:
-	Warhead@1Dam: SpreadDamage
-		Damage: 400
diff --git a/mods/cnc/weapons/missiles.yaml b/mods/cnc/weapons/missiles.yaml
index 6fd5ec53f1..1c48ad04c3 100644
--- a/mods/cnc/weapons/missiles.yaml
+++ b/mods/cnc/weapons/missiles.yaml
@@ -3,7 +3,7 @@
 	Range: 6c0
 	MinRange: 0c512
 	Report: bazook1.aud
-	ValidTargets: Ground, Air
+	ValidTargets: Ground, Water, Air
 	Projectile: Missile
 		Arm: 0
 		Blockable: false
@@ -82,7 +82,7 @@ OrcaAGMissiles:
 	ReloadDelay: 12
 	Range: 5c0
 	MinRange: 1c256
-	ValidTargets: Ground
+	ValidTargets: Ground, Water
 	Projectile: Missile
 		Arm: 1
 		HorizontalRateOfTurn: 20
@@ -141,7 +141,7 @@ MammothMissiles:
 	Burst: 4
 	BurstDelays: 4
 	Report: rocket1.aud
-	ValidTargets: Ground
+	ValidTargets: Ground, Water
 	TargetActorCenter: true
 	# Remove default Missile properties
 	-Projectile:
@@ -216,7 +216,7 @@ TowerMissile:
 	ReloadDelay: 15
 	Range: 7c0
 	Report: rocket2.aud
-	ValidTargets: Ground
+	ValidTargets: Ground, Water
 	Projectile: Missile
 		HorizontalRateOfTurn: 20
 		Speed: 298
diff --git a/mods/cnc/weapons/other.yaml b/mods/cnc/weapons/other.yaml
index 0c410d7cf4..3b2505f9d9 100644
--- a/mods/cnc/weapons/other.yaml
+++ b/mods/cnc/weapons/other.yaml
@@ -51,11 +51,11 @@ Chemspray:
 	Inherits: ^FlameWeapon
 	ReloadDelay: 65
 	Range: 3c0
-	InvalidTargets:
+	-InvalidTargets:
 	Warhead@1Dam: SpreadDamage
 		Spread: 256
 		Damage: 8000
-		InvalidTargets:
+		-InvalidTargets:
 		Versus:
 			None: 70
 			Wood: 35
diff --git a/mods/cnc/weapons/smallcaliber.yaml b/mods/cnc/weapons/smallcaliber.yaml
index e6ae8aca83..6d45e86948 100644
--- a/mods/cnc/weapons/smallcaliber.yaml
+++ b/mods/cnc/weapons/smallcaliber.yaml
@@ -148,6 +148,7 @@ APCGun:
 	Warhead@2Eff: CreateEffect
 		Explosions: small_frag
 		ValidTargets: Ground, Water, Air
+		ImpactActors: false
 
 APCGun.AA:
 	Inherits: APCGun
diff --git a/mods/cnc/weapons/superweapons.yaml b/mods/cnc/weapons/superweapons.yaml
index 3a3e755829..98188bb9fd 100644
--- a/mods/cnc/weapons/superweapons.yaml
+++ b/mods/cnc/weapons/superweapons.yaml
@@ -1,5 +1,5 @@
 Atomic:
-	ValidTargets: Ground, Air, Trees
+	ValidTargets: Ground, Water, Air, Trees
 	Report: nukemisl.aud
 	Warhead@1Dam_impact: SpreadDamage
 		Spread: 1c0
@@ -90,7 +90,7 @@ Atomic:
 		Multiplier: 1,1
 
 IonCannon:
-	ValidTargets: Ground, Air, Trees
+	ValidTargets: Ground, Water, Air, Trees
 	Warhead@1Dam_impact: SpreadDamage
 		Range: 0, 1c1, 2c1, 2c512
 		Damage: 10000