diff --git a/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp b/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp
index cb9dfbb46..09f037570 100644
--- a/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp
+++ b/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp
@@ -196,7 +196,6 @@ void TimeDisplayWindow::Draw() {
                 uint16_t textureIndex = 0;
 
                 for (size_t i = 0; i < textLength; i++) {
-                    ImVec2 originalCursorPos = ImGui::GetCursorPos();
                     if (textToDecode[i] == ':' || textToDecode[i] == '.') {
                         textureIndex = 10;
                     } else {
diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp
index 903984f12..9ef0fe2ab 100644
--- a/soh/soh/Enhancements/debugconsole.cpp
+++ b/soh/soh/Enhancements/debugconsole.cpp
@@ -402,6 +402,7 @@ static bool EntranceHandler(std::shared_ptr<Ship::Console> Console, const std::v
     gPlayState->transitionTrigger = TRANS_TRIGGER_START;
     gPlayState->transitionType = TRANS_TYPE_INSTANT;
     gSaveContext.nextTransitionType = TRANS_TYPE_INSTANT;
+    return 0;
 }
 
 static bool VoidHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
diff --git a/soh/soh/Enhancements/debugger/MessageViewer.cpp b/soh/soh/Enhancements/debugger/MessageViewer.cpp
index 4c3f62693..3c10772f3 100644
--- a/soh/soh/Enhancements/debugger/MessageViewer.cpp
+++ b/soh/soh/Enhancements/debugger/MessageViewer.cpp
@@ -180,9 +180,7 @@ void MessageDebug_StartTextBox(const char* tableId, uint16_t textId, uint8_t lan
     Font* font = &msgCtx->font;
     sMessageHasSetSfx = 0;
     for (u32 i = 0; i < FONT_CHAR_TEX_SIZE * 120; i += FONT_CHAR_TEX_SIZE) {
-        if (&font->charTexBuf[i] != nullptr) {
-            gSPInvalidateTexCache(play->state.gfxCtx->polyOpa.p++, reinterpret_cast<uintptr_t>(&font->charTexBuf[i]));
-        }
+        gSPInvalidateTexCache(play->state.gfxCtx->polyOpa.p++, reinterpret_cast<uintptr_t>(&font->charTexBuf[i]));
     }
     R_TEXT_CHAR_SCALE = 75;
     R_TEXT_LINE_SPACING = 12;
diff --git a/soh/soh/Enhancements/debugger/performanceTimer.cpp b/soh/soh/Enhancements/debugger/performanceTimer.cpp
index f52a8efac..69ffc6925 100644
--- a/soh/soh/Enhancements/debugger/performanceTimer.cpp
+++ b/soh/soh/Enhancements/debugger/performanceTimer.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "performanceTimer.h"
 
 void StartPerformanceTimer(TimerID timer){