diff --git a/AltairZ80/altairz80_cpu.c b/AltairZ80/altairz80_cpu.c
index 574202ec..67e5803d 100644
--- a/AltairZ80/altairz80_cpu.c
+++ b/AltairZ80/altairz80_cpu.c
@@ -429,7 +429,7 @@ REG cpu_reg[] = {
         REG_RO              }, /* 77 */
     { HRDATAD (PREVCAP,  previousCapacity,   32, "Previous size of RAM pseudo register"),
         REG_RO              }, /* 78 */
-    { BRDATAD (PCQ,      pcq, 16, 16, PCQ_SIZE, "Program counter circular buffer for 8080 /Z80 pseudo register"),
+    { BRDATAD (PCQ,      &pcq, 16, 16, PCQ_SIZE, "Program counter circular buffer for 8080 /Z80 pseudo register"),
         REG_RO + REG_CIRC   }, /* 79 */
     { DRDATAD (PCQP,     pcq_p,          PCQ_SIZE_LOG2, "Circular buffer head for 8080 / Z80 pseudo register"),
         REG_HRO             }, /* 80 */
diff --git a/AltairZ80/altairz80_dsk.c b/AltairZ80/altairz80_dsk.c
index 06892de6..5b8303eb 100644
--- a/AltairZ80/altairz80_dsk.c
+++ b/AltairZ80/altairz80_dsk.c
@@ -298,17 +298,17 @@ static UNIT dsk_unit[] = {
 static REG dsk_reg[] = {
     { DRDATAD (DISK,         current_disk,      4,
                "Selected disk register"),                                                   },
-    { BRDATAD (CURTRACK,    current_track,      10, 32, NUM_OF_DSK,
+    { BRDATAD (CURTRACK,    &current_track,     10, 32, NUM_OF_DSK,
                "Selected track register array"), REG_CIRC + REG_RO                          },
-    { BRDATAD (CURSECTOR,   current_sector,     10, 32, NUM_OF_DSK,
+    { BRDATAD (CURSECTOR,   &current_sector,    10, 32, NUM_OF_DSK,
                "Selected sector register array"), REG_CIRC + REG_RO                         },
-    { BRDATAD (CURBYTE, current_byte,           10, 32, NUM_OF_DSK,
+    { BRDATAD (CURBYTE, &current_byte,          10, 32, NUM_OF_DSK,
                "Current byte register array"), REG_CIRC + REG_RO                           },
-    { BRDATAD (CURFLAG, current_flag,           10, 32, NUM_OF_DSK,
+    { BRDATAD (CURFLAG, &current_flag,          10, 32, NUM_OF_DSK,
                "Current flag register array"), REG_CIRC + REG_RO                            },
-    { BRDATAD (TRACKS,      tracks,             10, 8,  NUM_OF_DSK,
+    { BRDATAD (TRACKS,      &tracks,            10, 8,  NUM_OF_DSK,
                "Number of tracks register array"),    REG_CIRC                              },
-    { BRDATAD (SECTPERTRACK,sectors_per_track,  10, 8,  NUM_OF_DSK,
+    { BRDATAD (SECTPERTRACK,&sectors_per_track, 10, 8,  NUM_OF_DSK,
                "Number of sectors per track register array"), REG_CIRC                      },
     { DRDATAD (IN9COUNT,     in9_count,         4,
                "Count of IN(9) register"),  REG_RO                                          },
@@ -318,9 +318,9 @@ static REG dsk_reg[] = {
                "BOOL for write needed register"), REG_RO                                    },
     { DRDATAD (DSKWL,        warnLevelDSK,      32,
                "Warn level register")                                                       },
-    { BRDATAD (WARNLOCK,     warnLock,          10, 32, NUM_OF_DSK,
+    { BRDATAD (WARNLOCK,     &warnLock,         10, 32, NUM_OF_DSK,
                "Count of write to locked register array"), REG_CIRC + REG_RO                },
-    { BRDATAD (WARNATTACHED, warnAttached,      10, 32, NUM_OF_DSK,
+    { BRDATAD (WARNATTACHED, &warnAttached,     10, 32, NUM_OF_DSK,
                "Count for selection of unattached disk register array"), REG_CIRC + REG_RO  },
     { DRDATAD (WARNDSK10,    warnDSK10,         4,
                "Count of IN(8) on unattached disk register"), REG_RO                        },
@@ -328,7 +328,7 @@ static REG dsk_reg[] = {
                "Count of IN/OUT(9) on unattached disk register"), REG_RO                    },
     { DRDATAD (WARNDSK12,    warnDSK12,         4,
                "Count of IN/OUT(10) on unattached disk register"), REG_RO                   },
-    { BRDATAD (DISKBUFFER,   dskbuf,            10, 8,  DSK_SECTSIZE,
+    { BRDATAD (DISKBUFFER,   &dskbuf,           10, 8,  DSK_SECTSIZE,
                "Disk data buffer array"), REG_CIRC + REG_RO                                 },
     { NULL }
 };
diff --git a/AltairZ80/s100_disk3.c b/AltairZ80/s100_disk3.c
index 2972da38..9ce17be9 100644
--- a/AltairZ80/s100_disk3.c
+++ b/AltairZ80/s100_disk3.c
@@ -224,7 +224,7 @@ static REG disk3_reg[] = {
                "Link address for next IOPB"),                   },
     { HRDATAD (DMA_ADDR,   disk3_info_data.dma_addr,  32,
                "DMA address for the current IOPB"),             },
-    { BRDATAD (IOPB,       &disk3_info_data.iopb[DISK3_IOPB_CMD],  16, 8, 16,
+    { BRDATAD (IOPB,       &disk3_info_data.iopb,     16, 8, 16,
                "IOPB command register"), }                      ,
     { NULL }
 };
diff --git a/AltairZ80/s100_fif.c b/AltairZ80/s100_fif.c
index 8bb32e6d..ed29e3d6 100644
--- a/AltairZ80/s100_fif.c
+++ b/AltairZ80/s100_fif.c
@@ -93,7 +93,7 @@ static REG fif_reg[] = {
                "Current selected disk")                                                     },
     { DRDATAD (DSKWL,        warnLevelDSK, 32,
                "Warn level register")                                                       },
-    { BRDATAD (WARNATTACHED, warnAttached,   10, 32, NUM_OF_DSK,
+    { BRDATAD (WARNATTACHED, &warnAttached,  10, 32, NUM_OF_DSK,
                "Count for selection of unattached disk register array"), REG_CIRC + REG_RO  },
     { DRDATAD (WARNDSK11,    warnDSK11, 4,
                "Count of IN/OUT(9) on unattached disk register"), REG_RO                    },
diff --git a/AltairZ80/s100_if3.c b/AltairZ80/s100_if3.c
index 090690e1..ac947663 100644
--- a/AltairZ80/s100_if3.c
+++ b/AltairZ80/s100_if3.c
@@ -107,10 +107,10 @@ static uint8 if3_tisr[IF3_MAX_BOARDS] = { 0, 0, 0, 0 };
 static REG if3_reg[] = {
     { HRDATAD (USER,     if3_user,       3, "IF3 user register"), },
     { HRDATAD (BOARD,    if3_board,      2, "IF3 board register"), },
-    { BRDATAD (RIMR,     &if3_rimr[0],   16, 8, 4, "IF3 RIMR register array"), },
-    { BRDATAD (RISR,     &if3_risr[0],   16, 8, 4, "IF3 RISR register array"), },
-    { BRDATAD (TIMR,     &if3_timr[0],   16, 8, 4, "IF3 TIMR register array"), },
-    { BRDATAD (TISR,     &if3_tisr[0],   16, 8, 4, "IF3 TISR register array"), },
+    { BRDATAD (RIMR,     &if3_rimr,      16, 8, 4, "IF3 RIMR register array"), },
+    { BRDATAD (RISR,     &if3_risr,      16, 8, 4, "IF3 RISR register array"), },
+    { BRDATAD (TIMR,     &if3_timr,      16, 8, 4, "IF3 TIMR register array"), },
+    { BRDATAD (TISR,     &if3_tisr,      16, 8, 4, "IF3 TISR register array"), },
     { NULL }
 };