diff --git a/bin/basic_generic.rom b/bin/basic_generic.rom
index 24f25b28..6291a248 100644
Binary files a/bin/basic_generic.rom and b/bin/basic_generic.rom differ
diff --git a/bin/basic_ultimate64.rom b/bin/basic_ultimate64.rom
index c9df070d..315bdd13 100644
Binary files a/bin/basic_ultimate64.rom and b/bin/basic_ultimate64.rom differ
diff --git a/bin/kernal_generic.rom b/bin/kernal_generic.rom
index ed644e42..e9d83db5 100644
Binary files a/bin/kernal_generic.rom and b/bin/kernal_generic.rom differ
diff --git a/bin/kernal_ultimate64.rom b/bin/kernal_ultimate64.rom
index 4124be18..d40bcbbd 100644
Binary files a/bin/kernal_ultimate64.rom and b/bin/kernal_ultimate64.rom differ
diff --git a/bin/mega65.rom b/bin/mega65.rom
index d6379421..d6ac5504 100644
Binary files a/bin/mega65.rom and b/bin/mega65.rom differ
diff --git a/bin/mega65_pxlfont.rom b/bin/mega65_pxlfont.rom
index f56acc9f..d04867f4 100644
Binary files a/bin/mega65_pxlfont.rom and b/bin/mega65_pxlfont.rom differ
diff --git a/src/basic/editor/tk_shorten.s b/src/basic/editor/tk_shorten.s
index 1d3fe0a1..916a8f41 100644
--- a/src/basic/editor/tk_shorten.s
+++ b/src/basic/editor/tk_shorten.s
@@ -31,9 +31,8 @@ tk_shorten_1n:
 	ldy tk__byte_offset                // will be needed in both cases
 
 	// Now we need to check which nibble to cut away
-
 	bit tk__nibble_flag
-	bcs tk_shorten_1n_lo
+	bmi tk_shorten_1n_lo
 
 	// FALLTROUGH
 
@@ -45,7 +44,7 @@ tk_shorten_1n_hi:                      // tk__nibble_flag = $00, both nibbles fr
     sty tk__byte_offset
 
 	lda tk__packed, y
-	and #$F0
+	and #$0F
 	sta tk__packed, y
 
 	// Adjust remaining counters / flags, and quit
@@ -78,7 +77,7 @@ tk_shorten_3n:
 	// Now we need to check which nibble to cut away
 
 	bit tk__nibble_flag
-	bcs tk_shorten_3n_2bytes
+	bmi tk_shorten_3n_2bytes
 
 	// FALLTROUGH