diff --git a/mods/d2k/rules/atreides.yaml b/mods/d2k/rules/atreides.yaml
index cb63599b65..a8946aa740 100644
--- a/mods/d2k/rules/atreides.yaml
+++ b/mods/d2k/rules/atreides.yaml
@@ -6,6 +6,16 @@ PWRA:
 	Buildable:
 		Owner: atreides
 
+GUNTOWERA:
+	Inherits: ^GUNTOWER
+	Buildable:
+		Owner: atreides
+
+ROCKETTOWERA:
+	Inherits: ^ROCKETTOWER
+	Buildable:
+		Owner: atreides
+
 REFA:
 	Inherits: ^REFINERY
 	Buildable:
diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml
index 94aa3fdedc..d59a8f5b35 100644
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -28,7 +28,7 @@
 		Types:Vehicle
 	GivesBounty:
 	Repairable:
-		RepairBuildings: repair
+		RepairBuildings: repaira,repairo,repairh
 	DebugMuzzlePositions:
 	Guard:
 	Guardable:
diff --git a/mods/d2k/rules/harkonnen.yaml b/mods/d2k/rules/harkonnen.yaml
index f39b1d775f..ce191b57b1 100644
--- a/mods/d2k/rules/harkonnen.yaml
+++ b/mods/d2k/rules/harkonnen.yaml
@@ -6,6 +6,16 @@ PWRH:
 	Buildable:
 		Owner: harkonnen
 
+GUNTOWERH:
+	Inherits: ^GUNTOWER
+	Buildable:
+		Owner: harkonnen
+
+ROCKETTOWERH:
+	Inherits: ^ROCKETTOWER
+	Buildable:
+		Owner: harkonnen
+
 REFH:
 	Inherits: ^REFINERY
 	Buildable:
diff --git a/mods/d2k/rules/ordos.yaml b/mods/d2k/rules/ordos.yaml
index fcc7371e12..8a2d03ab39 100644
--- a/mods/d2k/rules/ordos.yaml
+++ b/mods/d2k/rules/ordos.yaml
@@ -6,6 +6,16 @@ PWRO:
 	Buildable:
 		Owner: ordos
 
+GUNTOWERO:
+	Inherits: ^GUNTOWER
+	Buildable:
+		Owner: ordos
+
+ROCKETTOWERO:
+	Inherits: ^ROCKETTOWER
+	Buildable:
+		Owner: ordos
+
 REFO:
 	Inherits: ^REFINERY
 	Buildable:
diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml
index b8ee1e9382..7e5e400794 100644
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -261,9 +261,9 @@
 		Sequence: idle-welding
 
 ^RADAR:
+	Inherits: ^Building
 	RequiresPower:
 	CanPowerDown:
-	Inherits: ^Building
 	Buildable:
 		Prerequisites: Barracks
 		Queue: Building
@@ -418,7 +418,6 @@ WALL:
 	RenderRangeCircle:
 	RenderBuilding:
 		HasMakeAnimation: false
-		Image: guntowera
 	WithTurret:
 	Turreted:
 		ROT: 6