diff --git a/PDP10/ks10_kmc.c b/PDP10/ks10_kmc.c
index ed879c7..9bc089f 100644
--- a/PDP10/ks10_kmc.c
+++ b/PDP10/ks10_kmc.c
@@ -627,7 +627,7 @@ DEVICE kmc_dev = {
     NULL,                                       /* attach routine */
     NULL,                                       /* detach routine */
     &kmc_dib,                                   /* context */
-    KMC_DIS                                     /* Flags */
+    DEV_DIS                                     /* Flags */
              | DEV_DISABLE
              | DEV_DEBUG,
     0,                                          /* debug control */
diff --git a/PDP10/ks10_uba.c b/PDP10/ks10_uba.c
index 00c6293..51a1a77 100644
--- a/PDP10/ks10_uba.c
+++ b/PDP10/ks10_uba.c
@@ -208,12 +208,14 @@ uba_read_npr(t_addr addr, uint16 ctl, uint64 *data)
 {
     int     ubm = uba_device[ctl];
     uint32  map = uba_map[ubm][(077) & (addr >> 11)];
+    t_addr  oaddr = addr;
     if ((addr & 0400000) != 0)
         return 0;
     if ((map & MAP_VALID) == 0)
         return 0;
     addr = (map & PAGE_MASK) | (addr >> 2) & 0777;
     *data = M[addr];
+    sim_debug(DEBUG_DATA, &cpu_dev, "Rd NPR %08o %08o %012llo\n", oaddr, addr, *data);
     return 1;
 }
 
@@ -302,7 +304,7 @@ uba_read_npr_word(t_addr addr, uint16 ctl, uint16 *data)
         return 0;
     addr = (map & PAGE_MASK) | (addr >> 2) & 0777;
     wd = M[addr];
-    sim_debug(DEBUG_EXP, &cpu_dev, "RD NPR W %08o %08o %012llo m=%o\n", oaddr, addr, wd, map);
+    sim_debug(DEBUG_DATA, &cpu_dev, "RD NPR W %08o %08o %012llo m=%o\n", oaddr, addr, wd, map);
     if ((oaddr & 02) == 0)
         wd >>= 18;
     *data = (uint16)(wd & 0177777);
@@ -326,7 +328,7 @@ uba_write_npr_word(t_addr addr, uint16 ctl, uint16 data)
     msk = 0177777;
     buf = (uint64)(data & msk);
     wd = M[addr];
-    sim_debug(DEBUG_EXP, &cpu_dev, "WR NPR W %08o %08o %012llo m=%o\n", oaddr, addr, wd, map);
+    sim_debug(DEBUG_DATA, &cpu_dev, "WR NPR W %08o %08o %012llo m=%o\n", oaddr, addr, wd, map);
     if ((oaddr & 02) == 0) {
         buf <<= 18;
         msk <<= 18;