diff --git a/src/dusk/imgui/ImGuiMenuRandomizer.cpp b/src/dusk/imgui/ImGuiMenuRandomizer.cpp
index 1b30b5dbcd..d5b79837a4 100644
--- a/src/dusk/imgui/ImGuiMenuRandomizer.cpp
+++ b/src/dusk/imgui/ImGuiMenuRandomizer.cpp
@@ -510,7 +510,7 @@ namespace dusk {
             LocationTrackerInfo info {
                 .locationName = location->GetName(),
                 .logicStr = location->GetComputedRequirement().to_string(),
-                .locationItem = itemId >= 0 ? world->GetItem(itemId)->GetName() : "Unknown",
+                .locationItem = itemId >= 0 ? world->GetItem(itemId, true)->GetName() : "Unknown",
                 .accessible = m_currentSearch._visitedLocations.contains(location)
             };
 
diff --git a/src/dusk/randomizer/game/tools.cpp b/src/dusk/randomizer/game/tools.cpp
index e235686f1b..c1b976eaff 100644
--- a/src/dusk/randomizer/game/tools.cpp
+++ b/src/dusk/randomizer/game/tools.cpp
@@ -168,10 +168,11 @@ int getTempleKeysFound(int stage) {
     };
 
     int count = dComIfGs_getKeyNum(stage);
+    int saveId = getStageSaveId(stage);
 
     // Add number of unlocked key doors for this dungeon to current key count
     for (auto flag : keyDoorFlags[stage]) {
-        if (dComIfGs_isSwitch(stage, flag)) {
+        if (tracker_isStageSwitch(saveId, flag)) {
             count += 1;
         }
     }