diff --git a/cpu/DrZ80/drz80.s b/cpu/DrZ80/drz80.s
index a623451b..08f8a19e 100644
--- a/cpu/DrZ80/drz80.s
+++ b/cpu/DrZ80/drz80.s
@@ -144,7 +144,7 @@ z80_xmap_write8_handler: @ data, addr, func
 z80_xmap_read16: @ addr
     @ check if we cross bank boundary
     add r1,r0,#1
-    eor r1,r0,r0
+    eor r1,r1,r0
     tst r1,#1<<Z80_MEM_SHIFT
     bne 0f
 
@@ -171,11 +171,11 @@ z80_xmap_read16: @ addr
 
 z80_xmap_write16: @ data, addr
     add r2,r1,#1
-    eor r2,r1,r1
+    eor r2,r2,r1
     tst r2,#1<<Z80_MEM_SHIFT
     bne 0f
 
-    ldr r2,[cpucontext,#z80_read8]
+    ldr r2,[cpucontext,#z80_write8]
     add r2,r2,r1,lsr #Z80_MEM_SHIFT-2
     bic r2,r2,#3
     ldr r2,[r2]
diff --git a/pico/sms.c b/pico/sms.c
index ba9be50d..6cc6f3ca 100644
--- a/pico/sms.c
+++ b/pico/sms.c
@@ -141,6 +141,7 @@ static int bank_mask;
 
 static void write_bank(unsigned short a, unsigned char d)
 {
+  elprintf(EL_Z80BNK, "bank %04x %02x @ %04x", a, d, z80_pc());
   switch (a & 0x0f)
   {
     case 0x0c:
@@ -272,7 +273,8 @@ void PicoFrameMS(void)
     cycles_done += z80_run((cycles_aim - cycles_done) >> 8) << 8;
   }
 
-  PsndGetSamplesMS();
+  if (PsndOut)
+    PsndGetSamplesMS();
 }
 
 void PicoFrameDrawOnlyMS(void)