diff --git a/src/audio/heap.c b/src/audio/heap.c
index 10340752..37fa8496 100644
--- a/src/audio/heap.c
+++ b/src/audio/heap.c
@@ -1248,8 +1248,8 @@ void audio_reset_session(void) {
     if (gReverbDownsampleRate < (1 << (reverbConsole - 1)))
         gReverbDownsampleRate = (1 << (reverbConsole - 1));
     reverbWindowSize /= gReverbDownsampleRate;
-    if (reverbWindowSize < DEFAULT_LEN_2CH) // This might not actually be necessary?
-        reverbWindowSize = DEFAULT_LEN_2CH;
+    // if (reverbWindowSize < DEFAULT_LEN_2CH) // This might not actually be necessary?
+    //     reverbWindowSize = DEFAULT_LEN_2CH;
 #endif
 
     switch (gReverbDownsampleRate) {
diff --git a/src/game/game_init.c b/src/game/game_init.c
index 6cfa8f55..b1bccfac 100644
--- a/src/game/game_init.c
+++ b/src/game/game_init.c
@@ -44,7 +44,7 @@ struct GfxPool *gGfxPool;
 OSContStatus gControllerStatuses[4];
 OSContPad gControllerPads[4];
 u8 gControllerBits;
-u8 gIsConsole;
+u8 gIsConsole = TRUE; // Needs to be initialized before audio_reset_session is called
 u8 gBorderHeight;
 #ifdef EEP
 s8 gEepromProbe;
@@ -76,11 +76,9 @@ UNUSED static s32 sUnusedGameInitValue = 0;
 
 // General timer that runs as the game starts
 u32 gGlobalTimer = 0;
-u8 gIsConsole;
 #ifdef WIDE
 u8 gWidescreen;
 #endif
-u8 gBorderHeight;
 
 // Framebuffer rendering values (max 3)
 u16 sRenderedFramebuffer = 0;