diff --git a/src/dusk/randomizer/generator/data/locations.yaml b/src/dusk/randomizer/generator/data/locations.yaml
index a83c5844ce..6cb0f2be7e 100644
--- a/src/dusk/randomizer/generator/data/locations.yaml
+++ b/src/dusk/randomizer/generator/data/locations.yaml
@@ -6706,11 +6706,11 @@
     - Palace of Twilight
     - Heart Container
     - Dungeon Reward
-    - Freestanding Item
   Goal Location: True
   Metadata:
-    - Stage: 16
-      Flag: 0x80
+    Freestanding Item:
+      - Stage: 16
+        Flag: 0x80
 
 # HYRULE CASTLE
 
diff --git a/src/dusk/randomizer/generator/data/macros.yaml b/src/dusk/randomizer/generator/data/macros.yaml
index 88e7d3ff30..e6d803ab2e 100644
--- a/src/dusk/randomizer/generator/data/macros.yaml
+++ b/src/dusk/randomizer/generator/data/macros.yaml
@@ -246,7 +246,7 @@ Can Break Hyrule Castle Barrier: Hyrule_Barrier_Requirements == Open or
 
 Can Open Hyrule Castle Big Key Gate: Hyrule_Castle_Big_Key_Requirements == None or
                                      (Hyrule_Castle_Big_Key_Requirements == Fused_Shadows and count(Progressive_Fused_Shadow, Hyrule_Castle_Big_Key_Fused_Shadows)) or
-                                     (Hyrule_Castle_Big_Key_Requirements == Mirror_Shards and count(Progressive_Fused_Shadow, Hyrule_Castle_Big_Key_Mirror_Shards)) or
+                                     (Hyrule_Castle_Big_Key_Requirements == Mirror_Shards and count(Progressive_Mirror_Shard, Hyrule_Castle_Big_Key_Mirror_Shards)) or
                                      (Hyrule_Castle_Big_Key_Requirements == Dungeons and dungeons_completed(Hyrule_Castle_Big_Key_Dungeons)) or
                                      (Hyrule_Castle_Big_Key_Requirements == Poe_Souls and count(Poe_Soul, Hyrule_Castle_Big_Key_Poe_Souls)) or
                                      (Hyrule_Castle_Big_Key_Requirements == Hearts and hearts(Hyrule_Castle_Big_Key_Hearts))