diff --git a/desmume/src/armcpu.h b/desmume/src/armcpu.h
index 52d692946..dfa8ca26e 100644
--- a/desmume/src/armcpu.h
+++ b/desmume/src/armcpu.h
@@ -26,6 +26,9 @@
 
 #include "bits.h"
 
+#define ARMCPU_ARM7 1
+#define ARMCPU_ARM9 0
+
 #define CODE(i)     (((i)>>25)&0X7)
 #define OPCODE(i)   (((i)>>21)&0xF)
 #define SIGNEBIT(i) BIT_N(i,20)
diff --git a/desmume/src/debug.c b/desmume/src/debug.c
index 32825c770..6359802b5 100644
--- a/desmume/src/debug.c
+++ b/desmume/src/debug.c
@@ -146,7 +146,7 @@ Debug * MainLog;
 //////////////////////////////////////////////////////////////////////////////
 
 void LogStart(void) {
-        MainLog = DebugInit("main", DEBUG_STDOUT, NULL);
+        MainLog = DebugInit("main", DEBUG_STDERR, NULL);
 //        MainLog = DebugInit("main", DEBUG_STREAM, "stdout.txt");
 }