diff --git a/include/config/config_debug.h b/include/config/config_debug.h
index be5ef636d..3931fe1f4 100644
--- a/include/config/config_debug.h
+++ b/include/config/config_debug.h
@@ -42,7 +42,7 @@
  * Enable/Disable BGM on Map Select
  * Comment this to disable BGM
  */
-// #define MAP_SELECT_BGM NA_BGM_OWL
+#define MAP_SELECT_BGM NA_BGM_OWL
 
 /**
  * Fix a crash if you spawn in a grotto without using the grotto actor
diff --git a/src/audio/general.c b/src/audio/general.c
index 65a14efdb..4188deb57 100644
--- a/src/audio/general.c
+++ b/src/audio/general.c
@@ -1231,7 +1231,7 @@ u16 D_8016B7E4;
 struct {
     char str[5];
     u16 num;
-} sAudioScrPrtBuf[IS_AUDIO_DEBUG_ENABLED ? SCROLL_PRINT_BUF_SIZE : 0];
+} sAudioScrPrtBuf[SCROLL_PRINT_BUF_SIZE];
 
 u8 sRiverSoundMainBgmVol;
 u8 sRiverSoundMainBgmCurrentVol;
diff --git a/src/audio/sfx.c b/src/audio/sfx.c
index c0f86f3cb..9f6af0ef8 100644
--- a/src/audio/sfx.c
+++ b/src/audio/sfx.c
@@ -34,9 +34,9 @@ u8 sCurSfxPlayerChannelIndex;
 u8 gSfxBankMuted[7];
 UnusedBankLerp sUnusedBankLerp[7];
 
-u16 gAudioSfxSwapSource[IS_AUDIO_DEBUG_ENABLED ? 10 : 0];
-u16 gAudioSfxSwapTarget[IS_AUDIO_DEBUG_ENABLED ? 10 : 0];
-u8 gAudioSfxSwapMode[IS_AUDIO_DEBUG_ENABLED ? 10 : 0];
+u16 gAudioSfxSwapSource[10];
+u16 gAudioSfxSwapTarget[10];
+u8 gAudioSfxSwapMode[10];
 
 void Audio_SetSfxBanksMute(u16 muteMask) {
     u8 bankId;
diff --git a/src/code/z_debug.c b/src/code/z_debug.c
index 1d3568d22..a7d3b26a3 100644
--- a/src/code/z_debug.c
+++ b/src/code/z_debug.c
@@ -18,7 +18,7 @@ typedef struct {
 RegEditor* gRegEditor; // ``gRegEditor->data`` is used by non-debug features in normal gameplay
 
 // ENABLE_CAMERA_DEBUGGER
-DebugCamTextBufferEntry sDebugCamTextBuffer[IS_CAMERA_DEBUG_ENABLED ? 22 : 0];
+DebugCamTextBufferEntry sDebugCamTextBuffer[22];
 
 s16 sDebugCamTextEntryCount = 0;
 
diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.c b/src/overlays/actors/ovl_En_Changer/z_en_changer.c
index cf5e1efe3..5a7ec629c 100644
--- a/src/overlays/actors/ovl_En_Changer/z_en_changer.c
+++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.c
@@ -282,7 +282,7 @@ void EnChanger_Update(Actor* thisx, PlayState* play) {
         this->timer--;
     }
 
-    if (BREG(0)) {
+    if (IS_ACTOR_DEBUG_ENABLED && BREG(0)) {
         DebugDisplay_AddObject(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z,
                                this->actor.world.rot.x, this->actor.world.rot.y, this->actor.world.rot.z, 1.0f, 1.0f,
                                1.0f, 255, 0, 255, 255, 4, play->state.gfxCtx);
diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c
index 15ea944f0..4bcd1e588 100644
--- a/src/overlays/gamestates/ovl_select/z_select.c
+++ b/src/overlays/gamestates/ovl_select/z_select.c
@@ -75,7 +75,7 @@ void MapSelect_Init(GameState* thisx) {
 #ifdef MAP_SELECT_BGM
     this->toggleBGM = true;
 #else
-#define MAP_SELECT_BGM NA_BGM_STOP
+#define MAP_SELECT_BGM NA_BGM_NO_MUSIC
 #endif
 }