diff --git a/src/zvm_m65/z80_reset.s b/src/zvm_m65/z80_reset.s
index 6a97db9f..dd8ba8ea 100644
--- a/src/zvm_m65/z80_reset.s
+++ b/src/zvm_m65/z80_reset.s
@@ -13,7 +13,7 @@ Z80_reset:
 @1:
 	sta z80_cpustate__start, y
 	iny
-	cmp #(z80_cpustate__end - z80_cpustate__start + 1)
+	cpy #(z80_cpustate__end - z80_cpustate__start + 1)
 	bne @1
 
 	dew REG_AF               ; AF and SP have $FFFF value at start
diff --git a/src/zvm_m65/z80_table_gen.s b/src/zvm_m65/z80_table_gen.s
index fa52c7b7..e7c202f2 100644
--- a/src/zvm_m65/z80_table_gen.s
+++ b/src/zvm_m65/z80_table_gen.s
@@ -7,7 +7,7 @@
 Z80_table_gen:
 
 	jsr PRIMM
-	!pet $0D, "Generating CPU tables... "
+	!pet $0D, "Generating CPU tables"
 	!byte 0
 
 	;
@@ -23,7 +23,7 @@ Z80_table_gen:
 	;
 
 	jsr PRIMM
-	!pet "done", $0D, $0D
+	!pet "    done", $0D, $0D
 	!byte 0
 	
 	rts
diff --git a/src/zvm_m65/zvm_cputest.s b/src/zvm_m65/zvm_cputest.s
index d34833a3..3aae1781 100644
--- a/src/zvm_m65/zvm_cputest.s
+++ b/src/zvm_m65/zvm_cputest.s
@@ -36,7 +36,7 @@ ZVM_cputest:
 	+bcc @end
 
 	jsr PRIMM
-	!pet "Loading 'Z80TEST.COM'... ", 0
+	!pet "Loading Z80TEST.COM", 0
 
 	; Open the file
 
@@ -105,6 +105,8 @@ ZVM_cputest:
 
 @loop3:
 
+	inc $D020
+
 	dew BIOS_LOADCOUNT
 	bmi @loop2
 
@@ -118,6 +120,9 @@ ZVM_cputest:
 
 @load_done:
 
+	jsr PRIMM
+	!pet "      done", $0D, $0D, 0
+
 	; At this moment we have Z80TEST.COM loaded into memory
 	; Install a virtual CP/M, set PC to $0100, and run it!