diff --git a/jigsaw-pieces/pillager_outpost/feature_cage1.json b/jigsaw-pieces/pillager_outpost/feature_cage1.json
index 8070855e..90595ac6 100644
--- a/jigsaw-pieces/pillager_outpost/feature_cage1.json
+++ b/jigsaw-pieces/pillager_outpost/feature_cage1.json
@@ -28,21 +28,6 @@
             },
             "direction": "SOUTH_POSITIVE_Z"
         },
-        {
-            "targetName": "minecraft:feature",
-            "innerConnector": true,
-            "entityCount": 1,
-            "spawnEntity": "iron_golem",
-            "rotateConnector": false,
-            "name": "minecraft:feature",
-            "pools": ["empty"],
-            "position": {
-                "x": 1,
-                "y": -3,
-                "z": 0
-            },
-            "direction": "UP_POSITIVE_Y"
-        },
         {
             "targetName": "minecraft:feature",
             "innerConnector": false,
@@ -70,6 +55,21 @@
                 "z": 3
             },
             "direction": "SOUTH_POSITIVE_Z"
+        },
+        {
+            "targetName": "*",
+            "innerConnector": false,
+            "entityCount": 1,
+            "rotateConnector": false,
+            "spawnEntity": "iron_golem",
+            "name": "",
+            "pools": [],
+            "position": {
+                "x": 0,
+                "y": -2,
+                "z": 0
+            },
+            "direction": "UP_POSITIVE_Y"
         }
     ],
     "placementOptions": {
diff --git a/jigsaw-pieces/pillager_outpost/feature_cage2.json b/jigsaw-pieces/pillager_outpost/feature_cage2.json
index b2b5f9fb..b1b01612 100644
--- a/jigsaw-pieces/pillager_outpost/feature_cage2.json
+++ b/jigsaw-pieces/pillager_outpost/feature_cage2.json
@@ -42,25 +42,10 @@
             },
             "direction": "SOUTH_POSITIVE_Z"
         },
-        {
-            "targetName": "minecraft:feature",
-            "innerConnector": false,
-            "entityCount": 1,
-            "rotateConnector": false,
-            "name": "minecraft:feature",
-            "pools": ["empty"],
-            "position": {
-                "x": 3,
-                "y": -2,
-                "z": 3
-            },
-            "direction": "SOUTH_POSITIVE_Z"
-        },
         {
             "targetName": "*",
             "innerConnector": true,
             "entityCount": 1,
-            "spawnEntity": "iron_golem",
             "rotateConnector": false,
             "name": "",
             "pools": [],
@@ -70,6 +55,21 @@
                 "z": 0
             },
             "direction": "UP_POSITIVE_Y"
+        },
+        {
+            "targetName": "*",
+            "innerConnector": false,
+            "entityCount": 1,
+            "rotateConnector": false,
+            "spawnEntity": "iron_golem",
+            "name": "",
+            "pools": [],
+            "position": {
+                "x": 0,
+                "y": -2,
+                "z": 0
+            },
+            "direction": "UP_POSITIVE_Y"
         }
     ],
     "placementOptions": {
diff --git a/jigsaw-pieces/stronghold/portal/main.json b/jigsaw-pieces/stronghold/portal/main.json
index 599eb4b4..07dfcfa8 100644
--- a/jigsaw-pieces/stronghold/portal/main.json
+++ b/jigsaw-pieces/stronghold/portal/main.json
@@ -31,6 +31,25 @@
                             }
                         ]
                     }
+                },{
+                    "find": [
+                        {"block": "end_portal_frame"}
+                    ],
+                    "replace": {
+                        "palette": [
+                            {
+                                "weight": 3,
+                                "block": "end_portal_frame",
+                                "data": {
+                                    "eye": true
+                                }
+                            },
+                            {
+                                "weight": 10,
+                                "block": "end_portal_frame"
+                            }
+                        ]
+                    }
                 }],
         "bottom": false,
         "translateCenter": false,
diff --git a/jigsaw-pieces/stronghold/room/witch-room-end.json b/jigsaw-pieces/stronghold/room/witch-room-end.json
index 8bf1c866..71b272da 100644
--- a/jigsaw-pieces/stronghold/room/witch-room-end.json
+++ b/jigsaw-pieces/stronghold/room/witch-room-end.json
@@ -6,7 +6,7 @@
             "entityCount": 1,
             "rotateConnector": false,
             "name": "",
-            "pools": [""],
+            "pools": [],
             "position": {
                 "x": 0,
                 "y": -3,