diff --git a/Apple1.ino b/Apple1.ino
index b9308c7..d75252d 100644
--- a/Apple1.ino
+++ b/Apple1.ino
@@ -6,6 +6,7 @@
 #include <pia.h>
 #include <sd_filer.h>
 
+#include "hardware.h"
 #include "io.h"
 #include "disp.h"
 #include "screen_disp.h"
@@ -107,20 +108,20 @@ void setup() {
 
 	hardware_init(cpu);
 
-	DBG(print("RAM:    "));
-	DBG(print(RAM_PAGES));
-	DBG(print("kB at 0x0000"));
-	DBG(println());
+	DBG_INI(print("RAM:    "));
+	DBG_INI(print(RAM_PAGES));
+	DBG_INI(print("kB at 0x0000"));
+	DBG_INI(println());
 
 	for (unsigned i = 0; i < RAM_PAGES; i++)
 		memory.put(pages[i], i * ram<>::page_size);
 
 #if defined(USE_SPIRAM)
-	DBG(print("SpiRAM: "));
-	DBG(print(SPIRAM_EXTENT * Memory::page_size / 1024));
-	DBG(print("kB at 0x"));
-	DBG(print(SPIRAM_BASE, 16));
-	DBG(println());
+	DBG_INI(print("SpiRAM: "));
+	DBG_INI(print(SPIRAM_EXTENT * Memory::page_size / 1024));
+	DBG_INI(print("kB at 0x"));
+	DBG_INI(print(SPIRAM_BASE, 16));
+	DBG_INI(println());
 
 	memory.put(sram, SPIRAM_BASE, SPIRAM_EXTENT);
 #endif
diff --git a/Makefile b/Makefile
index 2569d93..86be851 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,7 @@
 t ?= esp32
 
 TERMINAL_SPEED := 115200
-#CPPFLAGS = -Wall -DDEBUGGING -DCPU_DEBUG=false -DTERMINAL_SPEED=$(TERMINAL_SPEED) -DUSE_OWN_KBD
-CPPFLAGS = -Wall -DTERMINAL_SPEED=$(TERMINAL_SPEED) -DUSE_OWN_KBD
+CPPFLAGS = -Wall -DDEBUGGING=0x00 -DTERMINAL_SPEED=$(TERMINAL_SPEED) -DUSE_OWN_KBD
 LIBRARIES = PS2KeyAdvanced PS2KeyMap SimpleTimer
 
 ifeq ($t, esp8266)