diff --git a/OpenRA.Game/Traits/World/ResourceLayer.cs b/OpenRA.Game/Traits/World/ResourceLayer.cs
index 7d1afeada9..8797ce3336 100644
--- a/OpenRA.Game/Traits/World/ResourceLayer.cs
+++ b/OpenRA.Game/Traits/World/ResourceLayer.cs
@@ -104,7 +104,7 @@ namespace OpenRA.Traits
 		public int GetIdealDensity(int x, int y)
 		{
 			return (GetAdjacentCellsWith(content[x, y].type, x, y) *
-				content[x, y].image.Length) / 9;
+				(content[x, y].image.Length - 1)) / 9;
 		}
 
 		public void AddResource(ResourceTypeInfo info, int i, int j, int n)
@@ -130,7 +130,10 @@ namespace OpenRA.Traits
 			if (type == null) return null;
 
 			if (--content[p.X, p.Y].density < 0)
+			{
 				content[p.X, p.Y].type = null;
+				content[p.X, p.Y].image = null;
+			}
 			return type;
 		}
 
diff --git a/mods/cnc/defaults.yaml b/mods/cnc/defaults.yaml
index 198f741784..3ddebcce3b 100644
--- a/mods/cnc/defaults.yaml
+++ b/mods/cnc/defaults.yaml
@@ -43,7 +43,6 @@
 	Building:
 		Dimensions: 1,1
 		Footprint: x
-		BaseNormal: no
 		BuildSounds: constru2.aud, hvydoor1.aud
 		SellSounds: cashturn.aud
 	RenderBuilding:
@@ -64,6 +63,7 @@
 		SellSounds: cashturn.aud
 		Capturable: false
 		Bib: no
+		BaseNormal: no
 		Crewed: no
 		Sight: 0
 	Wall: