diff --git a/docs/index.html b/docs/index.html
index 730e41d44..b31aec4a5 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -4702,8 +4702,8 @@ Ms Pac-Man (Stella extended codes):
         <tr><td>DPC </td><td>Pitfall II </td><td>.DPC </td></tr>
         <tr><td>DPC+</td><td>Enhanced DPC </td><td>.DPP, .DPC+ </td></tr>
         <tr><td>E0 </td><td>8K Parker Bros </td><td>.E0 </td></tr>
-        <tr><td>E7 </td><td>16K M-network </td><td>.E7 </td></tr>
-        <tr><td>E78K </td><td>8K M-network </td><td>.E78, .E78K </td></tr>
+        <tr><td>E7 </td><td>16K M Network </td><td>.E7 </td></tr>
+        <tr><td>E78K </td><td>8K M Network </td><td>.E78, .E78K </td></tr>
         <tr><td>EF </td><td>64K Homestar Runner </td><td>.EF </td></tr>
         <tr><td>EFSC </td><td>64K Homestar Runner + RAM</td><td>.EFS, .EFSC </td></tr>
         <tr><td>F0 </td><td>Dynacom Megaboy </td><td>.F0 </td></tr>
diff --git a/src/debugger/CartDebug.cxx b/src/debugger/CartDebug.cxx
index 47d3212ab..68e2d0f7a 100644
--- a/src/debugger/CartDebug.cxx
+++ b/src/debugger/CartDebug.cxx
@@ -302,12 +302,16 @@ bool CartDebug::disassemble(int bank, uInt16 PC, bool force)
       AddressList::const_iterator i;
       for(i = addresses.cbegin(); i != addresses.cend(); ++i)
       {
-        if (PC == *i)  // already present
+        if(PC == *i)  // already present
           break;
       }
       // Otherwise, add the item at the end
-      if (i == addresses.end())
+      if(i == addresses.end())
+      {
         addresses.push_back(PC);
+        if(!DiStella::settings.resolveCode)
+          addDirective(Device::AccessType::CODE, PC, PC, bank);
+      }
     }
 
     // Always attempt to resolve code sections unless it's been
@@ -347,8 +351,8 @@ bool CartDebug::fillDisassemblyList(BankInfo& info, uInt16 search)
     const DisassemblyTag& tag = myDisassembly.list[i];
     const uInt16 address = tag.address & 0xFFF;
 
-    // Exclude 'Device::ROW'; they don't have a valid address
-    if(tag.type != Device::ROW)
+    // Exclude 'Device::ROW|NONE'; they don't have a valid address
+    if(tag.type != Device::ROW && tag.type != Device::NONE)
     {
       // Create a mapping from addresses to line numbers
       myAddrToLineList.emplace(address, i);
diff --git a/src/debugger/gui/CartMNetworkWidget.cxx b/src/debugger/gui/CartMNetworkWidget.cxx
index b251faebf..d81f1c1f9 100644
--- a/src/debugger/gui/CartMNetworkWidget.cxx
+++ b/src/debugger/gui/CartMNetworkWidget.cxx
@@ -37,7 +37,7 @@ void CartridgeMNetworkWidget::initialize(GuiObject* boss,
   uInt32 size = cart.romBankCount() * cart.BANK_SIZE;
 
   int xpos = 2,
-    ypos = addBaseInformation(size, "M-Network", info.str(), 15) +
+    ypos = addBaseInformation(size, "M Network", info.str(), 15) +
     myLineHeight;
 
   VariantList items0, items1;
diff --git a/src/debugger/gui/RomWidget.cxx b/src/debugger/gui/RomWidget.cxx
index 0454ef16d..16f8da5e7 100644
--- a/src/debugger/gui/RomWidget.cxx
+++ b/src/debugger/gui/RomWidget.cxx
@@ -75,6 +75,7 @@ void RomWidget::loadConfig()
 
   // Update romlist to point to current PC (if it has changed)
   int pcline = cart.addressToLine(dbg.cpuDebug().pc());
+
   if(pcline >= 0 && pcline != myRomList->getHighlighted())
     myRomList->setHighlighted(pcline);
 
diff --git a/src/emucore/Bankswitch.cxx b/src/emucore/Bankswitch.cxx
index 2ea053df1..5a1fba540 100644
--- a/src/emucore/Bankswitch.cxx
+++ b/src/emucore/Bankswitch.cxx
@@ -124,8 +124,8 @@ Bankswitch::BSList = {{
   { "DPC"     , "DPC (Pitfall II)"            },
   { "DPC+"    , "DPC+ (Enhanced DPC)"         },
   { "E0"      , "E0 (8K Parker Bros)"         },
-  { "E7"      , "E7 (16K M-network)"          },
-  { "E78K"    , "E78K (8K M-network)"         },
+  { "E7"      , "E7 (16K M Network)"          },
+  { "E78K"    , "E78K (8K M Network)"         },
   { "EF"      , "EF (64K H. Runner)"          },
   { "EFSC"    , "EFSC (64K H. Runner + RAM)"  },
   { "F0"      , "F0 (Dynacom Megaboy)"        },