diff --git a/mods/ts/rules/gdi-structures.yaml b/mods/ts/rules/gdi-structures.yaml
index 587110bb34..02c3dace23 100644
--- a/mods/ts/rules/gdi-structures.yaml
+++ b/mods/ts/rules/gdi-structures.yaml
@@ -44,7 +44,7 @@ GAPOWR:
 		Conditions:
 			powrup: powrup.a
 		Requirements:
-			powrup: !build-incomplete
+			powrup: !build-incomplete && !powrup.a
 	Power@pluga:
 		RequiresCondition: !empdisable && powrup.a
 		Amount: 50
@@ -57,7 +57,7 @@ GAPOWR:
 		Conditions:
 			powrup: powrup.b
 		Requirements:
-			powrup: !build-incomplete
+			powrup: !build-incomplete && !powrup.b
 	WithIdleOverlay@plugb:
 		RequiresCondition: !build-incomplete && powrup.b
 		PauseOnCondition: empdisable
diff --git a/mods/ts/rules/gdi-support.yaml b/mods/ts/rules/gdi-support.yaml
index 5d68558a1d..48e034d00c 100644
--- a/mods/ts/rules/gdi-support.yaml
+++ b/mods/ts/rules/gdi-support.yaml
@@ -133,9 +133,9 @@ GACTWR:
 			tower.rocket: tower.rocket
 			tower.sam: tower.sam
 		Requirements:
-			tower.vulcan: !build-incomplete
-			tower.rocket: !build-incomplete
-			tower.sam: !build-incomplete
+			tower.vulcan: !build-incomplete && !tower.vulcan && !tower.rocket && !tower.sam
+			tower.rocket: !build-incomplete && !tower.rocket && !tower.vulcan && !tower.sam
+			tower.sam: !build-incomplete && !tower.vulcan && !tower.rocket && !tower.sam
 	ProvidesPrerequisite@buildingname:
 	SelectionDecorations:
 	Replacement: