diff --git a/c64/kernal/keyboard/chrin_keyboard.s b/c64/kernal/keyboard/chrin_keyboard.s
index e50ee425..be3efa72 100644
--- a/c64/kernal/keyboard/chrin_keyboard.s
+++ b/c64/kernal/keyboard/chrin_keyboard.s
@@ -72,7 +72,7 @@ read_from_keyboard:
 	cmp #$0D
 	bne not_enter
 
-chrin_enter: // YYY test this!
+chrin_enter:
 
 	jsr cursor_disable
 	jsr pop_keyboard_buffer
diff --git a/c64/kernal/screen/chrout_screen.s b/c64/kernal/screen/chrout_screen.s
index ae97035f..c509ce8b 100644
--- a/c64/kernal/screen/chrout_screen.s
+++ b/c64/kernal/screen/chrout_screen.s
@@ -111,7 +111,7 @@ chrout_screen_literal:
 	// If not the 80th character of the logical row, we are done
 
 	cpy #80
-	bcc chrout_screen_done
+	bcc chrout_screen_calc_lptr_done
 
 	// Advance to the next line