diff --git a/firmware/AtomBusMon.c b/firmware/AtomBusMon.c
index 3025e79..5b14470 100644
--- a/firmware/AtomBusMon.c
+++ b/firmware/AtomBusMon.c
@@ -358,7 +358,7 @@ char *modeStrings[NUM_MODES] = {
 #define BW_RDWR_MASK (BW_RD_MASK | BW_WR_MASK)
 
 // Mask for all breakpoints that read/write Memory or IO
-#define B_RDWR_MASK  (BW_RD_MASK & B_MASK)
+#define B_RDWR_MASK  (BW_RDWR_MASK & B_MASK)
 
 /********************************************************
  * External Trigger definitions
@@ -951,6 +951,7 @@ void doCmdReset(char *params) {
   hwCmd(CMD_STEP, 0);
   Delay_us(50);
   hwCmd(CMD_RESET, 0);
+  logAddr();
 }
 
 #ifdef CPUEMBEDDED
diff --git a/firmware/dis6809.c b/firmware/dis6809.c
index 252dac6..7e98b3b 100644
--- a/firmware/dis6809.c
+++ b/firmware/dis6809.c
@@ -32,7 +32,7 @@ typedef signed short tt_s16;
 
 unsigned int get_memw(unsigned int addr) {
   loadAddr(addr);
-  return readMemByteInc() + (readMemByteInc() << 8);
+  return (readMemByteInc() << 8) + readMemByteInc();
 }
 
 enum opcodes {