diff --git a/soh/soh/CrashHandlerExt.cpp b/soh/soh/CrashHandlerExt.cpp
index cc9c7b1ee..3ca821460 100644
--- a/soh/soh/CrashHandlerExt.cpp
+++ b/soh/soh/CrashHandlerExt.cpp
@@ -19,7 +19,7 @@ static std::array<const char*, ACTORCAT_MAX> sCatToStrArray{
     "SWITCH", "BG", "PLAYER", "EXPLOSIVE", "NPC", "ENEMY", "PROP", "ITEMACTION", "MISC", "BOSS", "DOOR", "CHEST",
 };
 
-#define DEFINE_SCENE(_1, _2, enumName, _4, _5, _6) #enumName
+#define DEFINE_SCENE(_1, _2, enumName, _4, _5, _6) #enumName,
 
 static std::array<const char*, SCENE_ID_MAX> sSceneIdToStrArray{
 #include "tables/scene_table.h"
diff --git a/soh/soh/Enhancements/randomizer/ShuffleCrates.cpp b/soh/soh/Enhancements/randomizer/ShuffleCrates.cpp
index 53a65df22..6962b290d 100644
--- a/soh/soh/Enhancements/randomizer/ShuffleCrates.cpp
+++ b/soh/soh/Enhancements/randomizer/ShuffleCrates.cpp
@@ -336,7 +336,7 @@ void Rando::StaticData::RegisterCrateLocations() {
     locationTable[RC_GF_SOUTHMOST_CENTER_CRATE]                           = Location::Crate(RC_GF_SOUTHMOST_CENTER_CRATE,                           RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(315, -1534),       "Southmost Center Crate",                 RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_SOUTHMOST_CENTER_CRATE));
     locationTable[RC_GF_MID_SOUTH_CENTER_CRATE]                           = Location::Crate(RC_GF_MID_SOUTH_CENTER_CRATE,                           RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(315, -1594),       "Middle South Center Crate",              RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_MID_SOUTH_CENTER_CRATE));
     locationTable[RC_GF_MID_NORTH_CENTER_CRATE]                           = Location::Crate(RC_GF_MID_NORTH_CENTER_CRATE,                           RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(310, -1782),       "Middle North Center Crate",              RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_MID_NORTH_CENTER_CRATE));
-    locationTable[RR_GF_NORTHMOST_CENTER_CRATE]                           = Location::Crate(RR_GF_NORTHMOST_CENTER_CRATE,                           RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(310, -1842),       "Northmost Center Crate",                 RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_NORTHMOST_CENTER_CRATE));
+    locationTable[RC_GF_NORTHMOST_CENTER_CRATE]                           = Location::Crate(RC_GF_NORTHMOST_CENTER_CRATE,                           RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(310, -1842),       "Northmost Center Crate",                 RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_NORTHMOST_CENTER_CRATE));
     locationTable[RC_GF_OUTSKIRTS_NE_CRATE]                               = Location::Crate(RC_GF_OUTSKIRTS_NE_CRATE,                               RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(-60, -2210),       "Outskirts Northeast Crate",              RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_OUTSKIRTS_NE_CRATE));
     locationTable[RC_GF_OUTSKIRTS_NW_CRATE]                               = Location::Crate(RC_GF_OUTSKIRTS_NW_CRATE,                               RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(-120, -2210),      "Outskirts Northwest Crate",              RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_OUTSKIRTS_NW_CRATE));
     locationTable[RC_GF_HBA_RANGE_CRATE_2]                                = Location::Crate(RC_GF_HBA_RANGE_CRATE_2,                                RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(4090, -1780),      "Horseback Archery Range Crate 2",        RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_HBA_RANGE_CRATE_2));
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_fortress.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_fortress.cpp
index 3929faf86..17e28d5eb 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_fortress.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_fortress.cpp
@@ -30,7 +30,7 @@ void RegionTable_Init_GerudoFortress() {
         LOCATION(RC_GF_SOUTHMOST_CENTER_CRATE, logic->CanBreakCrates()),
         LOCATION(RC_GF_MID_SOUTH_CENTER_CRATE, logic->CanBreakCrates()),
         LOCATION(RC_GF_MID_NORTH_CENTER_CRATE, logic->CanBreakCrates()),
-        LOCATION(RR_GF_NORTHMOST_CENTER_CRATE, logic->CanBreakCrates()),
+        LOCATION(RC_GF_NORTHMOST_CENTER_CRATE, logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_TH_1_TORCH_CELL,       []{return true;}),
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 2a2acd5c7..1fa5ab2f6 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -2330,7 +2330,7 @@ std::map<RandomizerCheck, RandomizerInf> rcToRandomizerInf = {
         RAND_INF_GF_MID_NORTH_CENTER_CRATE,
     },
     {
-        RR_GF_NORTHMOST_CENTER_CRATE,
+        RC_GF_NORTHMOST_CENTER_CRATE,
         RAND_INF_GF_NORTHMOST_CENTER_CRATE,
     },
     {
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 15a2fbd37..c2b9cbbdd 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -2396,7 +2396,7 @@ typedef enum {
     RC_GF_SOUTHMOST_CENTER_CRATE,
     RC_GF_MID_SOUTH_CENTER_CRATE,
     RC_GF_MID_NORTH_CENTER_CRATE,
-    RR_GF_NORTHMOST_CENTER_CRATE,
+    RC_GF_NORTHMOST_CENTER_CRATE,
     RC_GF_OUTSKIRTS_NE_CRATE,
     RC_GF_OUTSKIRTS_NW_CRATE,
     RC_GF_HBA_RANGE_CRATE_1,