diff --git a/src/debugger/Debugger.cxx b/src/debugger/Debugger.cxx
index 1db450924..18519954d 100644
--- a/src/debugger/Debugger.cxx
+++ b/src/debugger/Debugger.cxx
@@ -337,6 +337,7 @@ void Debugger::autoExec()
   myPrompt->print("autoExec():\n" + myParser->exec(file) + "\n");
   myPrompt->printPrompt();
 
+/* FIXME - get these working again
   // Init builtins
   for(int i = 0; builtin_functions[i][0] != ""; i++)
   {
@@ -346,6 +347,7 @@ void Debugger::autoExec()
     Expression* exp = YaccParser::getResult();
     addFunction(builtin_functions[i][0], builtin_functions[i][1], exp, true);
   }
+*/
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/debugger/DiStella.cxx b/src/debugger/DiStella.cxx
index 07c6a4890..d4d88fe52 100644
--- a/src/debugger/DiStella.cxx
+++ b/src/debugger/DiStella.cxx
@@ -146,7 +146,7 @@ void DiStella::disasm(CartDebug::DisassemblyList& list, uInt32 distart, int pass
       if (pass == 3)
       {
         bytes = 1;
-        myBuf << HEX4 << myPC+myOffset << "'L" << myPC+myOffset << "'.byte "
+        myBuf << HEX4 << myPC+myOffset << "'L" << HEX4 << myPC+myOffset << "'.byte "
               << "$" << HEX2 << (int)Debugger::debugger().peek(myPC+myOffset);
       }
       myPC++;