diff --git a/Makefile.common b/Makefile.common
index 6c2870f1c..64c32a433 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -11,23 +11,17 @@ SPLASH   =  resources/$(FLAVOR)_splash.png
 
 ifeq ($(FLAVOR),SafeMode9)
     CFLAGS += -DSAFEMODE
-endif
-
-ifeq ($(FLAVOR),GodMode64)
+else ifeq ($(FLAVOR),GodMode64)
     OVERRIDE_FONT := resources/fonts/font_c64_8x8.pbm
     CFLAGS += -DDEFAULT_FONT=\"font_c64_8x8.pbm\"
     CFLAGS += -DCOLOR_STD_FONT=0xD5717B
     CFLAGS += -DCOLOR_STD_BG=0xA43041
-endif
-
-ifeq ($(FLAVOR),BrickedMode9)
+else ifeq ($(FLAVOR),BrickedMode9)
     OVERRIDE_FONT := resources/fonts/font_nbraille_4x6.pbm
     CFLAGS += -DDEFAULT_FONT=\"font_nbraille_4x6.pbm\"
     CFLAGS += -DCOLOR_STD_FONT=0x00FFFF
     CFLAGS += -DCOLOR_STD_BG=0xFF0000
-endif
-
-ifeq ($(FLAVOR),ZuishMode9)
+else ifeq ($(FLAVOR),ZuishMode9)
     OVERRIDE_FONT := resources/fonts/font_zuish_8x8.pbm
     CFLAGS += -DDEFAULT_FONT=\"font_zuish_8x8.pbm\"
 endif
@@ -57,6 +51,10 @@ ifeq ($(HIDE_HIDDEN),1)
     CFLAGS += -DHIDE_HIDDEN
 endif
 
+ifeq ($(SHOW_FREE),1)
+    CFLAGS += -DSHOW_FREE
+endif
+
 ifdef FIXED_BRIGHTNESS
     CFLAGS += -DFIXED_BRIGHTNESS=$(FIXED_BRIGHTNESS)
 endif
@@ -65,6 +63,10 @@ ifdef SD_TIMEOUT
     CFLAGS += -DSD_TIMEOUT=$(SD_TIMEOUT)
 endif
 
+ifeq ($(MONITOR_HEAP),1)
+    CFLAGS += -DMONITOR_HEAP
+endif
+
 ifdef NTRBOOT
     FTFLAGS  = -S spi-retail
     FTDFLAGS = -S spi-dev
diff --git a/arm9/source/godmode.c b/arm9/source/godmode.c
index 52a16eee1..56a8860bf 100644
--- a/arm9/source/godmode.c
+++ b/arm9/source/godmode.c
@@ -176,9 +176,7 @@ void DrawTopBar(const char* curr_path) {
         DrawStringF(TOP_SCREEN, bartxt_rx, bartxt_start, COLOR_STD_BG, COLOR_TOP_BAR, "%19.19s", tempstr);
         show_time = false;
     }
-    #endif
-    
-    #ifdef MONITOR_HEAP
+    #elif defined MONITOR_HEAP
     if (true) { // allocated mem
         const u32 bartxt_rx = SCREEN_WIDTH_TOP - (9*FONT_WIDTH_EXT) - bartxt_x;
         char bytestr[32];
@@ -1819,7 +1817,7 @@ u32 HomeMoreMenu(char* current_path) {
             ShowString("Building " TIKDB_NAME_ENC "...");
             tik_enc_sys = (BuildTitleKeyInfo("1:/dbs/ticket.db", false, false) == 0);
             tik_enc_emu = (BuildTitleKeyInfo("4:/dbs/ticket.db", false, false) == 0);
-            if (BuildTitleKeyInfo(NULL, false, true) != 0)
+            if (!tik_enc_sys || BuildTitleKeyInfo(NULL, false, true) != 0)
                 tik_enc_sys = tik_enc_emu = false;
         }
         bool tik_dec_sys = false;