diff --git a/include/functions.h b/include/functions.h
index 2708a7f45..ec58d9b1c 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -1915,7 +1915,7 @@ void Interface_LoadItemIconImpl(GlobalContext* globalCtx, u8 arg1);
 // void func_80112C0C(void);
 u8 Item_Give(GlobalContext* globalCtx, u8 item);
 u8 Item_CheckObtainability(u8 item);
-void Inventory_DeleteItem(s16 item, s16 invSlot);
+void Inventory_DeleteItem(s16 item, s16 slot);
 void Inventory_UnequipItem(s16 item);
 s32 Inventory_ReplaceItem(GlobalContext* globalCtx, u8 oldItem, u8 newItem);
 void Inventory_UpdateDeitySwordEquip(GlobalContext* globalCtx) ;
diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c
index 5a234ea44..bc7dcd646 100644
--- a/src/code/z_kaleido_setup.c
+++ b/src/code/z_kaleido_setup.c
@@ -124,10 +124,10 @@ void KaleidoSetup_Init(GlobalContext* globalCtx) {
     pauseCtx->unk_258 = 11;
     pauseCtx->unk_25A = 0;
 
-    pauseCtx->unk_25E[PAUSE_0] = 999;
-    pauseCtx->unk_25E[PAUSE_1] = XREG(94) + 3;
-    pauseCtx->unk_25E[PAUSE_2] = 999;
-    pauseCtx->unk_25E[PAUSE_3] = 999;
+    pauseCtx->cursorItem[PAUSE_0] = 999;
+    pauseCtx->cursorItem[PAUSE_1] = XREG(94) + 3;
+    pauseCtx->cursorItem[PAUSE_2] = 999;
+    pauseCtx->cursorItem[PAUSE_3] = 999;
 
     pauseCtx->unk_268[PAUSE_0] = 0;
     pauseCtx->unk_268[PAUSE_1] = XREG(94) + 3;
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index a28ba887c..73bdc2937 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -920,10 +920,10 @@ u8 Item_CheckObtainability(u8 item) {
     return Item_CheckObtainabilityImpl(item);
 }
 
-void Inventory_DeleteItem(s16 item, s16 invSlot) {
+void Inventory_DeleteItem(s16 item, s16 slot) {
     s16 btn;
 
-    gSaveContext.save.inventory.items[invSlot] = ITEM_NONE;
+    gSaveContext.save.inventory.items[slot] = ITEM_NONE;
 
     for (btn = 1; btn < 4; btn++) {
         if (GET_CUR_FORM_BTN_ITEM(btn) == item) {
diff --git a/src/code/z_sram_NES.c b/src/code/z_sram_NES.c
index 2ebb32447..f1fba8576 100644
--- a/src/code/z_sram_NES.c
+++ b/src/code/z_sram_NES.c
@@ -407,7 +407,6 @@ void Sram_SaveEndOfCycle(GlobalContext* globalCtx) {
     SET_STOLEN_ITEM_1(STOLEN_ITEM_NONE);
     SET_STOLEN_ITEM_2(STOLEN_ITEM_NONE);
 
-    // ??
     Inventory_DeleteItem(ITEM_OCARINA_FAIRY, SLOT_TRADE_DEED);
     Inventory_DeleteItem(ITEM_SLINGSHOT, SLOT_TRADE_KEY_MAMA);
     Inventory_DeleteItem(ITEM_LONGSHOT, SLOT_TRADE_COUPLE);
diff --git a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c
index 1c48235ae..13a470709 100644
--- a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c
+++ b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c
@@ -296,7 +296,7 @@ s32 func_80BED140(GlobalContext* globalCtx) {
 }
 
 s32 func_80BED208(EnAkindonuts* this) {
-    if (INV_CONTENT(ITEM_BEAN) != 10U) {
+    if ((u32)INV_CONTENT(ITEM_BEAN) != 10) {
         return 0;
     }
 
diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
index f5d07fcf5..2ac74c770 100644
--- a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
+++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
@@ -357,7 +357,7 @@ void EnGinkoMan_WaitForDialogueInput(EnGinkoMan* this, GlobalContext* globalCtx)
                         this->isNewAccount = true;
                     }
 
-                    Rupees_ChangeBy((s16)-globalCtx->msgCtx.bankRupeesSelected);
+                    Rupees_ChangeBy(-globalCtx->msgCtx.bankRupeesSelected);
                     this->previousBankValue = gSaveContext.save.bankRupees & 0xFFFF;
                     gSaveContext.save.bankRupees =
                         ((gSaveContext.save.bankRupees & 0xFFFF) + globalCtx->msgCtx.bankRupeesSelected) |
diff --git a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c
index b266cc0b6..c7a010c32 100644
--- a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c
+++ b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c
@@ -331,7 +331,7 @@ void func_80BCB6D0(EnScopenuts* this, GlobalContext* globalCtx) {
             }
         }
     } else if (temp_v0 == 4) {
-        if (Message_ShouldAdvance(globalCtx) != 0) {
+        if (Message_ShouldAdvance(globalCtx)) {
             switch (globalCtx->msgCtx.choiceIndex) {
                 case 0:
                     if (gSaveContext.save.playerData.rupees < this->unk_358) {
@@ -343,7 +343,7 @@ void func_80BCB6D0(EnScopenuts* this, GlobalContext* globalCtx) {
                         func_8019F208();
                         globalCtx->msgCtx.msgMode = 0x43;
                         globalCtx->msgCtx.unk12023 = 4;
-                        Rupees_ChangeBy(this->unk_358 * -1);
+                        Rupees_ChangeBy(-this->unk_358);
                         this->actionFunc = func_80BCB90C;
                     }
                     break;