diff --git a/c64/kernal/chrin.s b/c64/kernal/chrin.s
index 3d48373b..769e70b0 100644
--- a/c64/kernal/chrin.s
+++ b/c64/kernal/chrin.s
@@ -22,7 +22,7 @@ chrin:
 	sta keyboard_buffer,x
 	inx
 	iny
-	cpy keys_in_key_buffer
+	cpy key_buffer_size
 	bne -
 	dec keys_in_key_buffer
 	cli
diff --git a/c64/kernal/scan_keyboard.s b/c64/kernal/scan_keyboard.s
index 244c1dd6..7cedd60a 100644
--- a/c64/kernal/scan_keyboard.s
+++ b/c64/kernal/scan_keyboard.s
@@ -75,6 +75,7 @@ scan_keyboard:
 
 	;; Convert matrix position to key code
 	;; XXX - Add offset of $40, $80 or $C0 if shift, CONTROL or C= are held down
+	and #$3f
 	tax
 	lda keyboard_matrixes,x
 
@@ -86,6 +87,7 @@ scan_keyboard:
 	inc keys_in_key_buffer
 	
 	*
+	lda keys_in_key_buffer
 
 	rts