diff --git a/src/debugger/CartDebug.cxx b/src/debugger/CartDebug.cxx
index 89c3d94d0..daeee9f72 100644
--- a/src/debugger/CartDebug.cxx
+++ b/src/debugger/CartDebug.cxx
@@ -385,7 +385,7 @@ int CartDebug::addressToLine(uInt16 address) const
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-string CartDebug::disassemble(uInt16 start, uInt16 lines) const
+string CartDebug::disassembleLines(uInt16 start, uInt16 lines) const
 {
   // Fill the string with disassembled data
   start &= 0xFFF;
@@ -1096,8 +1096,6 @@ string CartDebug::saveDisassembly()
 
     BankInfo& info = myBankInfo[bank];
 
-    // TODO: make PageAccess ready for multi-bank ROMs
-    // TODO: define offset if still undefined
     disassembleBank(bank);
 
     // An empty address list means that DiStella can't do a disassembly
@@ -1126,7 +1124,7 @@ string CartDebug::saveDisassembly()
     else
       buf << "    ORG     $" << Base::HEX4 << origin << "\n"
           << "    RORG    $" << Base::HEX4 << info.offset << "\n\n";
-    origin += info.size;
+    origin += uInt32(info.size);
 
     // Format in 'distella' style
     for(uInt32 i = 0; i < disasm.list.size(); ++i)
diff --git a/src/debugger/CartDebug.hxx b/src/debugger/CartDebug.hxx
index 327450560..f0b4b49fe 100644
--- a/src/debugger/CartDebug.hxx
+++ b/src/debugger/CartDebug.hxx
@@ -127,7 +127,7 @@ class CartDebug : public DebuggerSystem
 
       @return  The disassembly represented as a string
     */
-    string disassemble(uInt16 start, uInt16 lines) const;
+    string disassembleLines(uInt16 start, uInt16 lines) const;
 
     /**
       Add a directive to the disassembler.  Directives are basically overrides
diff --git a/src/debugger/DebuggerParser.cxx b/src/debugger/DebuggerParser.cxx
index 77032fd5f..fb905e8a5 100644
--- a/src/debugger/DebuggerParser.cxx
+++ b/src/debugger/DebuggerParser.cxx
@@ -1082,7 +1082,7 @@ void DebuggerParser::executeDisasm()
     return;
   }
 
-  commandResult << debugger.cartDebug().disassemble(start, lines);
+  commandResult << debugger.cartDebug().disassembleLines(start, lines);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -