diff --git a/src/common/Version.hxx b/src/common/Version.hxx
index b218302a1..5f44fa50d 100644
--- a/src/common/Version.hxx
+++ b/src/common/Version.hxx
@@ -22,7 +22,7 @@
 
 #include <cstdlib>
 
-#define STELLA_VERSION "3.4_rc1"
+#define STELLA_VERSION "3.4"
 #define STELLA_BUILD atoi("$Rev$" + 6)
 
 #endif
diff --git a/src/debugger/DebuggerParser.cxx b/src/debugger/DebuggerParser.cxx
index 9f1b54e9b..112773f90 100644
--- a/src/debugger/DebuggerParser.cxx
+++ b/src/debugger/DebuggerParser.cxx
@@ -47,6 +47,8 @@
 #define CALL_METHOD(method) ( (this->*method)() )
 
 
+// TODO - use C++ streams instead of nasty C-strings and pointers
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 DebuggerParser::DebuggerParser(Debugger* d)
   : debugger(d)
diff --git a/src/emucore/M6502.ins b/src/emucore/M6502.ins
index e2c47c720..a6ca94011 100644
--- a/src/emucore/M6502.ins
+++ b/src/emucore/M6502.ins
@@ -2121,7 +2121,7 @@ case 0x20:
   poke(0x0100 + SP--, PC >> 8);
   poke(0x0100 + SP--, PC & 0xff);
 
-  PC = low | ((uInt16)peek(PC++, DISASM_CODE) << 8); 
+  PC = (low | ((uInt16)peek(PC, DISASM_CODE) << 8));
 }
 break;
 
diff --git a/src/emucore/M6502.m4 b/src/emucore/M6502.m4
index e66ed3109..4edf8ebd8 100644
--- a/src/emucore/M6502.m4
+++ b/src/emucore/M6502.m4
@@ -642,7 +642,7 @@ define(M6502_JSR, `{
   poke(0x0100 + SP--, PC >> 8);
   poke(0x0100 + SP--, PC & 0xff);
 
-  PC = low | ((uInt16)peek(PC++, DISASM_CODE) << 8); 
+  PC = (low | ((uInt16)peek(PC, DISASM_CODE) << 8));
 }')
 
 define(M6502_LAS, `{