diff --git a/modules/pdp11/lib/bus.js b/modules/pdp11/lib/bus.js
index fa7e590e0..cedf26bf7 100644
--- a/modules/pdp11/lib/bus.js
+++ b/modules/pdp11/lib/bus.js
@@ -494,7 +494,7 @@ class BusPDP11 extends Component {
             var block = this.aBusBlocks[iBlock];
             info.cbTotal += block.size;
             if (block.size) {
-                info.aBlocks.push(Usr.initBitFields(BlockInfoPDP11, iBlock, 0, 0, block.type));
+                info.aBlocks.push(/** @type {BlockInfoPDP11} */ (Usr.initBitFields(BlockInfoPDP11, iBlock, 0, 0, block.type)));
                 info.cBlocks++
             }
             iBlock++;
diff --git a/modules/pdp11/lib/debugger.js b/modules/pdp11/lib/debugger.js
index 8a9c59f5f..a5006971a 100644
--- a/modules/pdp11/lib/debugger.js
+++ b/modules/pdp11/lib/debugger.js
@@ -55,7 +55,7 @@ import MessagesPDP11 from "./messages";
  *      aCmds           preprocessed commands (from sCmd)
  *
  * @typedef {{
- *      addr:(number),
+ *      addr:(number|undefined),
  *      fPhysical:(boolean),
  *      fTemporary:(boolean),
  *      nBase:(number|undefined),
@@ -2918,7 +2918,7 @@ class DebuggerPDP11 extends Debugger {
              * TODO: Tweak this output to accommodate 18-bit machines as well as 22-bit machines.
              */
             var fPhysical = (dbgAddr.fPhysical || dbgAddr.addr > 0xffff);
-            var a = this.cpu.getAddrInfo(dbgAddr.addr, fPhysical);
+            var a = this.cpu.getAddrInfo(dbgAddr.addr || 0, fPhysical);
             this.println(Str.pad("", fPhysical? 12: 19) + Str.toBin(dbgAddr.addr, fPhysical? 22 : 17, 3) + "  " + Str.toOct(dbgAddr.addr, 8));
             if (a.length < 6) {
                 if (a.length > 2) {
diff --git a/modules/pdp11/lib/device.js b/modules/pdp11/lib/device.js
index e6e1da0fd..2d282101f 100644
--- a/modules/pdp11/lib/device.js
+++ b/modules/pdp11/lib/device.js
@@ -35,11 +35,13 @@
 import Str from "../../shared/es6/strlib";
 import Web from "../../shared/es6/weblib";
 import Component from "../../shared/es6/component";
+import PDP11 from "./defines";
 import BusPDP11 from "./bus";
 import MemoryPDP11 from "./memory";
 import MessagesPDP11 from "./messages";
 import PC11 from "./pc11";
 import RL11 from "./rl11";
+import RK11 from "./rk11";
 
 class DevicePDP11 extends Component {
     /**
diff --git a/modules/shared/es6/debugger.js b/modules/shared/es6/debugger.js
index cf6448432..16308d4e0 100644
--- a/modules/shared/es6/debugger.js
+++ b/modules/shared/es6/debugger.js
@@ -29,7 +29,7 @@
 "use strict";
 
 import Str from "../../shared/es6/strlib";
-import Component from "../..shared/es6/component";
+import Component from "../../shared/es6/component";
 
 /**
  * Debugger Address Object
diff --git a/modules/shared/es6/strlib.js b/modules/shared/es6/strlib.js
index 82264f4e4..d7192d28d 100644
--- a/modules/shared/es6/strlib.js
+++ b/modules/shared/es6/strlib.js
@@ -553,9 +553,9 @@ class Str {
      */
     static toASCIICode(b)
     {
-        var s = (b != Str.ASCII.CR && b != Str.ASCII.LF ? Str.aASCIICodes[b] : null);
-        if (s) {
-            s = '<' + s + '>';
+        var s;
+        if (b != Str.ASCII.CR && b != Str.ASCII.LF) {
+            s = '<' + Str.aASCIICodes[b] + '>';
         } else {
             s = String.fromCharCode(b);
         }