diff --git a/src/hw.accel.a b/src/hw.accel.a
index f46668e0b..5c8e706d8 100755
--- a/src/hw.accel.a
+++ b/src/hw.accel.a
@@ -232,6 +232,7 @@ build_addon
 ; setspeed must be self-modified before use (setspeed_x and
 ; setspeed_y).
 ;
+; all return with Z=0
 ;-----------------------------------------------------------
 
 ; Function #1: Apple IIc+
@@ -250,17 +251,17 @@ iicplus !pseudopc DisableAccelerator {
 
         ; cgga calls save X and Y regs but sets $0 to 0
         ; (this will get a laugh from C programmers)
+         php
          lda   $0
          pha
-         php
          sei             ; timing sensitive
          jsr   @jiggerypokery
          lda   gMachineInDHGRMode
          bne   +         ; DHGR mode doesn't need fix
          sta   $C05B     ; fix HGR-mode colouring
-+        plp             ; restore interrupt state
-         pla
++        pla
          sta   $0
+         plp             ; restore interrupt state
          rts
 
 @jiggerypokery
diff --git a/src/hw.accel.lc2.a b/src/hw.accel.lc2.a
index 59ea76bfe..de1005671 100644
--- a/src/hw.accel.lc2.a
+++ b/src/hw.accel.lc2.a
@@ -10,8 +10,8 @@
 
 EnableAcceleratorAndSwitchToBank1
          jsr   EnableAccelerator
-         jmp   SwitchToBank1
+         bne   +                     ; always taken
 
 DisableAcceleratorAndSwitchToBank1
          jsr   DisableAccelerator
-         jmp   SwitchToBank1
++        jmp   SwitchToBank1
diff --git a/src/ui.font.a b/src/ui.font.a
index 5d28cbc8b..5a6b14143 100644
--- a/src/ui.font.a
+++ b/src/ui.font.a
@@ -35,8 +35,3 @@ DrawCenteredString
          jsr   SwitchToBank2
          jsr   DrawCenteredStringInternal
          bmi   JmpSwitch             ; always
-
-DrawBuffer
-         jsr   SwitchToBank2
-         jsr   DrawBufferInternal
-         bmi   JmpSwitch             ; always