diff --git a/src/main/kc/lib/conio-mega65.c b/src/main/kc/lib/conio-mega65.c
index 4640a2497..32191cfe8 100644
--- a/src/main/kc/lib/conio-mega65.c
+++ b/src/main/kc/lib/conio-mega65.c
@@ -1,6 +1,7 @@
 // MEGA65 conio.h implementation
 #include <conio.h>
 #include <mega65.h>
+#include <6502.h>
 
 // The screen width
 #ifdef __MEGA65_C64__
@@ -27,18 +28,9 @@ const char CONIO_TEXTCOLOR_DEFAULT = LIGHT_BLUE;
 // Enable 2K Color ROM
 void conio_mega65_init() {
     // Disable BASIC/KERNAL interrupts
-    asm {
-        sei
-    }
+    SEI();
     // Map memory to BANK 0 : 0x00XXXX - giving access to I/O
-    asm {
-        lda #0
-        tax
-        tay
-        taz
-        map
-        eom
-    }
+    memoryRemap(0,0,0);
     // Enable the VIC 4
     *IO_KEY = 0x47;
     *IO_KEY = 0x53;
diff --git a/src/main/kc/lib/multiplexer.c b/src/main/kc/lib/multiplexer.c
index 66b41cabf..33e9136c9 100644
--- a/src/main/kc/lib/multiplexer.c
+++ b/src/main/kc/lib/multiplexer.c
@@ -136,6 +136,6 @@ inline char plexFreeNextYpos() {
 
 // Update the data structure to reflect that a sprite has been shown. This sprite will be free again after 21 lines.
 inline void plexFreeAdd(char ypos) {
-    PLEX_FREE_YPOS[plex_free_next] =  ypos+21;
+    PLEX_FREE_YPOS[plex_free_next] =  ypos+22;
     plex_free_next = (plex_free_next+1)&7;
 }
\ No newline at end of file