diff --git a/modules/pcjs/lib/chipset.js b/modules/pcjs/lib/chipset.js
index ec962a44b..4c804ac23 100644
--- a/modules/pcjs/lib/chipset.js
+++ b/modules/pcjs/lib/chipset.js
@@ -2103,7 +2103,7 @@ ChipSet.prototype.dumpTimer = function()
                     count |= (timer.countCurrent[i] << (i * 8));
                 }
             }
-            sDump += " MODE" + timer.mode + " BYTES=" + timer.countBytes + " COUNT=" + str.toHexWord(count);
+            sDump += " mode=" + timer.mode + " bytes=" + timer.countBytes + " count=" + str.toHexWord(count);
             this.dbg.message(sDump);
         }
     }
diff --git a/modules/pcjs/lib/debugger.js b/modules/pcjs/lib/debugger.js
index 687942066..e11557cbd 100644
--- a/modules/pcjs/lib/debugger.js
+++ b/modules/pcjs/lib/debugger.js
@@ -521,7 +521,7 @@ if (DEBUGGER) {
         "8042":     Debugger.MESSAGE.C8042,
         "chipset":  Debugger.MESSAGE.CHIPSET,   // ie, anything else in ChipSet besides DMA, PIC, TIMER, CMOS, RTC and 8042
         "kbd":      Debugger.MESSAGE.KBD,
-        "keys":     Debugger.MESSAGE.KEYS,
+        "key":      Debugger.MESSAGE.KEYS,      // using "keys" instead of "key" causes an unfortunate JavaScript property collision
         "video":    Debugger.MESSAGE.VIDEO,
         "fdc":      Debugger.MESSAGE.FDC,
         "hdc":      Debugger.MESSAGE.HDC,
@@ -1350,7 +1350,10 @@ if (DEBUGGER) {
      */
     Debugger.prototype.dumpDOS = function(s)
     {
-        if (!s) return;
+        if (!s) {
+            this.println("no MCB");
+            return;
+        }
 
         this.println("dumpDOS(" + s + ")");