diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 3c3ca9c6c..23fa4ffa9 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -259,7 +259,8 @@ namespace SohImGui {
     }
 
     void LoadRainbowColor() {
-        for (uint16_t s=0; s <= sizeof(RainbowColorCvarList); s++) {
+        u8 arrayLength = sizeof(RainbowColorCvarList) / sizeof(*RainbowColorCvarList);
+        for (u8 s = 0; s < arrayLength; s++) {
             std::string cvarName = RainbowColorCvarList[s];
             std::string Cvar_Red = cvarName;
             Cvar_Red += "R";
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
index ca1b67798..a0d27f70f 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
@@ -1316,6 +1316,9 @@ void DrawPlayerTab() {
             case ITEM_SWORD_BGS:
                 curSword = "Biggoron's Sword";
                 break;
+            case ITEM_FISHING_POLE:
+                curSword = "Fishing Pole";
+                break;
             case ITEM_NONE:
                 curSword = "None";
                 break;
@@ -1463,6 +1466,11 @@ void DrawPlayerTab() {
                 
                 Inventory_ChangeEquipment(EQUIP_SWORD, PLAYER_SWORD_BGS);
             }
+            if (ImGui::Selectable("Fishing Pole")) {
+                player->currentSwordItem = ITEM_FISHING_POLE;
+                gSaveContext.equips.buttonItems[0] = ITEM_FISHING_POLE;
+                Inventory_ChangeEquipment(EQUIP_SWORD, PLAYER_SWORD_MASTER);
+            }
             ImGui::EndCombo();
 
         }