diff --git a/B5500/b5500_dk.c b/B5500/b5500_dk.c
index 239a1187..84b12049 100644
--- a/B5500/b5500_dk.c
+++ b/B5500/b5500_dk.c
@@ -130,7 +130,7 @@ MTAB                dsk_mod[] = {
 };
 
 REG                 dsk_reg[] = {
-    {BRDATA(BUFF, &dsk_buffer, 16, 8, sizeof(dsk_buffer)), REG_HRO},
+    {BRDATA(BUFF, dsk_buffer, 16, 8, sizeof(dsk_buffer)), REG_HRO},
     {0}
 };
 
diff --git a/B5500/b5500_dtc.c b/B5500/b5500_dtc.c
index 91da478e..ad2edc4e 100644
--- a/B5500/b5500_dtc.c
+++ b/B5500/b5500_dtc.c
@@ -195,11 +195,11 @@ MTAB                dtc_mod[] = {
 REG                 dtc_reg[] = {
     {ORDATAD(BUFSIZE, dtc_bufsize, 8, "Buffer size"), REG_HRO},
     {ORDATAD(NLINES, dtc_desc.lines, 8, "Buffer size"), REG_HRO},
-    {BRDATA(BUF, &dtc_buf, 16, 8, sizeof(dtc_buf)), REG_HRO},
+    {BRDATA(BUF, dtc_buf, 16, 8, sizeof(dtc_buf)), REG_HRO},
     {BRDATA(LSTAT, dtc_lstatus, 16, 8, sizeof(dtc_lstatus)), REG_HRO},
-    {BRDATA(BUFPTR, dtc_bufptr, 16, 16, sizeof(dtc_bufptr)), REG_HRO},
-    {BRDATA(BUFSIZ, dtc_bsize, 16, 16, sizeof(dtc_bsize)), REG_HRO},
-    {BRDATA(BUFLIM, dtc_blimit, 16, 16, sizeof(dtc_blimit)), REG_HRO},
+    {BRDATA(BUFPTR, dtc_bufptr, 16, 16, sizeof(dtc_bufptr)/sizeof(uint16)), REG_HRO},
+    {BRDATA(BUFSIZ, dtc_bsize, 16, 16, sizeof(dtc_bsize)/sizeof(uint16)), REG_HRO},
+    {BRDATA(BUFLIM, dtc_blimit, 16, 16, sizeof(dtc_blimit)/sizeof(uint16)), REG_HRO},
     {0}
 };
 
diff --git a/B5500/b5500_mt.c b/B5500/b5500_mt.c
index 8f525341..30e9d23e 100644
--- a/B5500/b5500_mt.c
+++ b/B5500/b5500_mt.c
@@ -121,7 +121,7 @@ UNIT                mt_unit[] = {
 };
 
 REG                 mt_reg[] = {
-    {BRDATA(BUFF, &mt_buffer, 16, 8, sizeof(mt_buffer)), REG_HRO},
+    {BRDATA(BUFF, mt_buffer, 16, 8, sizeof(mt_buffer)), REG_HRO},
     {0}
 };
 
diff --git a/B5500/b5500_urec.c b/B5500/b5500_urec.c
index b853be9b..e69e0e1d 100644
--- a/B5500/b5500_urec.c
+++ b/B5500/b5500_urec.c
@@ -150,7 +150,7 @@ MTAB                cdr_mod[] = {
 };
 
 REG                 cdr_reg[] = {
-    {BRDATA(BUFF, &cdr_buffer, 16, 16, sizeof(cdr_buffer)/sizeof(uint16)), REG_HRO},
+    {BRDATA(BUFF, cdr_buffer, 16, 16, sizeof(cdr_buffer)/sizeof(uint16)), REG_HRO},
     {0}
 };  
 
@@ -177,7 +177,7 @@ MTAB                cdp_mod[] = {
 };
 
 REG                 cdp_reg[] = {
-    {BRDATA(BUFF, &cdp_buffer, 16, 16, sizeof(cdp_buffer)/sizeof(uint16)), REG_HRO},
+    {BRDATA(BUFF, cdp_buffer, 16, 16, sizeof(cdp_buffer)/sizeof(uint16)), REG_HRO},
     {0}
 };  
 
@@ -208,7 +208,7 @@ MTAB                lpr_mod[] = {
 };
 
 REG                 lpr_reg[] = {
-    {BRDATA(BUFF, &lpr_buffer, 16, 8, sizeof(lpr_buffer)), REG_HRO},
+    {BRDATA(BUFF, lpr_buffer, 16, 8, sizeof(lpr_buffer)), REG_HRO},
     {0}
 };  
 
@@ -228,7 +228,7 @@ UNIT                con_unit[] = {
 };
 
 REG                 con_reg[] = {
-    {BRDATA(BUFF, &con_data, 16, 8, sizeof(con_data)), REG_HRO},
+    {SAVEDATA(BUFF, con_data) },
     {0}
 };