diff --git a/6502/C64/Makefile b/6502/C64/Makefile
index a9f485e..bd29ec8 100644
--- a/6502/C64/Makefile
+++ b/6502/C64/Makefile
@@ -30,6 +30,8 @@ clean:
 
 # Convenience targets
 
+binaries: $(vf_binaries)
+
 test: $(test_resuls)
 
 test64: full64 lite64
@@ -94,14 +96,14 @@ test-lite-c64.log: emulator/vf-lite-c64.T64
 	  "include run-lite-tests.fth\n1234567890\n"
 	petscii2ascii cbmfiles/test.log $@
 
-test-full-c16+.log: emulator/vf-full-c16+.T64
+test-full-c16+.log: emulator/vf-full-c16+.T64 disks/scratch.d64
 	VICE=xplus4 emulator/run-in-vice.sh vf-full-c16+ \
-	  "include run-min-tests.fth\n1234567890\n"
+	  "include run-full-tests.fth\n1234567890\n"
 	petscii2ascii cbmfiles/test.log $@
 
 test-lite-c16+.log: emulator/vf-lite-c16+.T64
 	VICE=xplus4 emulator/run-in-vice.sh vf-lite-c16+ \
-	  "include run-min-tests.fth\n1234567890\n"
+	  "include run-lite-tests.fth\n1234567890\n"
 	petscii2ascii cbmfiles/test.log $@
 
 test-full-c16-.log: emulator/vf-full-c16-.T64
@@ -111,7 +113,7 @@ test-full-c16-.log: emulator/vf-full-c16-.T64
 
 test-lite-c16-.log: emulator/vf-lite-c16-.T64
 	VICE=xplus4 emulator/run-in-vice.sh vf-lite-c16- \
-	  "include run-min-tests.fth\n1234567890\n"
+	  "include run-lite-tests.fth\n1234567890\n"
 	petscii2ascii cbmfiles/test.log $@
 
 test-%.result: test-%.log test-%.golden tests/evaluate-test.sh
@@ -130,19 +132,20 @@ test-lite-c64.golden: $(patsubst %, tests/golden/%.golden, \
     prelim core coreext double report-noblk)
 	cat $? > $@
 
-c16_golden_parts = $(patsubst %, tests/golden/%.golden, \
-  prelim core)
-
-test-full-c16+.golden: $(c16_golden_parts)
+test-full-c16+.golden: $(patsubst %, tests/golden/%.golden, \
+    prelim core coreext double block report-blk)
 	cat $? > $@
 
-test-lite-c16+.golden: $(c16_golden_parts)
+test-lite-c16+.golden: $(patsubst %, tests/golden/%.golden, \
+    prelim core coreext double report-noblk)
 	cat $? > $@
 
-test-full-c16-.golden: $(c16_golden_parts)
+test-full-c16-.golden: $(patsubst %, tests/golden/%.golden, \
+    prelim core)
 	cat $? > $@
 
-test-lite-c16-.golden: $(c16_golden_parts)
+test-lite-c16-.golden: $(patsubst %, tests/golden/%.golden, \
+    prelim core coreext double report-noblk)
 	cat $? > $@
 
 # Rules for building Forth binaries on top of the plain vanilla
diff --git a/6502/C64/cbmfiles/vf-full-c16+ b/6502/C64/cbmfiles/vf-full-c16+
index d76c4c4..9129208 100644
Binary files a/6502/C64/cbmfiles/vf-full-c16+ and b/6502/C64/cbmfiles/vf-full-c16+ differ
diff --git a/6502/C64/cbmfiles/vf-lite-c16+ b/6502/C64/cbmfiles/vf-lite-c16+
index 52bb3b2..9fd1e60 100644
Binary files a/6502/C64/cbmfiles/vf-lite-c16+ and b/6502/C64/cbmfiles/vf-lite-c16+ differ
diff --git a/6502/C64/cbmfiles/vf-lite-c16- b/6502/C64/cbmfiles/vf-lite-c16-
index 8ab991b..dd4f9f3 100644
Binary files a/6502/C64/cbmfiles/vf-lite-c16- and b/6502/C64/cbmfiles/vf-lite-c16- differ
diff --git a/6502/C64/cbmfiles/vf-lite-c64 b/6502/C64/cbmfiles/vf-lite-c64
index efddc5b..56cc5e7 100644
Binary files a/6502/C64/cbmfiles/vf-lite-c64 and b/6502/C64/cbmfiles/vf-lite-c64 differ
diff --git a/6502/C64/src/vf-finalize.fth b/6502/C64/src/vf-finalize.fth
index ba8c83d..0b37fa3 100644
--- a/6502/C64/src/vf-finalize.fth
+++ b/6502/C64/src/vf-finalize.fth
@@ -55,29 +55,4 @@ xyNext Constant xyNext
 (2drop Constant Poptwo
 (drop  Constant Pop
 
-\ *** Block No. 125, Hexblock 7d
-7d fthpage
-
-\ System patchup              clv06aug87
-
 Forth definitions
-
-(C64  C000 ' limit >body !  7B00 s0 !  7F00 r0 ! )
-
-(C16  8000 ' limit >body !  7700 s0 !  7b00 r0 ! )
-
-\ (C16+ fd00 ' limit >body !
-\       7B00 s0 !  7F00 r0 ! )
-
-s0 @ dup s0 2- !      6 + s0 7 - !
-here dp !
-
-Host  Tudp @          Target  udp !
-Host  Tvoc-link @     Target  voc-link !
-Host  move-threads
-
-\ Final part of loadscreen
-
-Assembler nonrelocate
-
-.unresolved
diff --git a/6502/C64/src/vf-full-c16+.fth b/6502/C64/src/vf-full-c16+.fth
index becf82f..8419bb9 100644
--- a/6502/C64/src/vf-full-c16+.fth
+++ b/6502/C64/src/vf-full-c16+.fth
@@ -11,6 +11,8 @@ include vf-sys-c16.fth
 include vf-cbm-file.fth
 include vf-cbm-bufs.fth
 include vf-finalize.fth
+  fd00 ' limit >body !  bc00 s0 !  c000 r0 !
+include vf-memsetup.fth
 
 include vf-pr-target.fth
 quit
diff --git a/6502/C64/src/vf-full-c16-.fth b/6502/C64/src/vf-full-c16-.fth
index c2185ca..6bc240e 100644
--- a/6502/C64/src/vf-full-c16-.fth
+++ b/6502/C64/src/vf-full-c16-.fth
@@ -11,6 +11,8 @@ include vf-sys-c16.fth
 include vf-cbm-file.fth
 include vf-cbm-bufs.fth
 include vf-finalize.fth
+  8000 ' limit >body !  7700 s0 !  7b00 r0 !
+include vf-memsetup.fth
 
 include vf-pr-target.fth
 quit
diff --git a/6502/C64/src/vf-full-c64.fth b/6502/C64/src/vf-full-c64.fth
index c805888..ff6dce3 100644
--- a/6502/C64/src/vf-full-c64.fth
+++ b/6502/C64/src/vf-full-c64.fth
@@ -11,6 +11,8 @@ include vf-sys-c64.fth
 include vf-cbm-file.fth
 include vf-cbm-bufs.fth
 include vf-finalize.fth
+  C000 ' limit >body !  7B00 s0 !  7F00 r0 !
+include vf-memsetup.fth
 
 include vf-pr-target.fth
 quit
diff --git a/6502/C64/src/vf-lite-c16+.fth b/6502/C64/src/vf-lite-c16+.fth
index 7ea722d..bd3d436 100644
--- a/6502/C64/src/vf-lite-c16+.fth
+++ b/6502/C64/src/vf-lite-c16+.fth
@@ -10,6 +10,8 @@ include vf-cbm-core.fth
 include vf-sys-c16.fth
 include vf-cbm-file.fth
 include vf-finalize.fth
+  fd00 ' limit >body !  f900 s0 !  fd00 r0 !
+include vf-memsetup.fth
 
 include vf-pr-target.fth
 quit
diff --git a/6502/C64/src/vf-lite-c16-.fth b/6502/C64/src/vf-lite-c16-.fth
index 52d6597..1f2f6fe 100644
--- a/6502/C64/src/vf-lite-c16-.fth
+++ b/6502/C64/src/vf-lite-c16-.fth
@@ -10,6 +10,8 @@ include vf-cbm-core.fth
 include vf-sys-c16.fth
 include vf-cbm-file.fth
 include vf-finalize.fth
+  8000 ' limit >body !  7c00 s0 !  8000 r0 !
+include vf-memsetup.fth
 
 include vf-pr-target.fth
 quit
diff --git a/6502/C64/src/vf-lite-c64.fth b/6502/C64/src/vf-lite-c64.fth
index fd668b9..4a956d8 100644
--- a/6502/C64/src/vf-lite-c64.fth
+++ b/6502/C64/src/vf-lite-c64.fth
@@ -10,6 +10,8 @@ include vf-cbm-core.fth
 include vf-sys-c64.fth
 include vf-cbm-file.fth
 include vf-finalize.fth
+  c000 ' limit >body !  bc00 s0 !  c000 r0 !
+include vf-memsetup.fth
 
 include vf-pr-target.fth
 quit
diff --git a/6502/C64/src/vf-memsetup.fth b/6502/C64/src/vf-memsetup.fth
new file mode 100644
index 0000000..5debb6e
--- /dev/null
+++ b/6502/C64/src/vf-memsetup.fth
@@ -0,0 +1,18 @@
+
+\ *** Block No. 125, Hexblock 7d
+7d fthpage
+
+\ System patchup              clv06aug87
+
+s0 @ dup s0 2- !      6 + s0 7 - !
+here dp !
+
+Host  Tudp @          Target  udp !
+Host  Tvoc-link @     Target  voc-link !
+Host  move-threads
+
+\ Final part of loadscreen
+
+Assembler nonrelocate
+
+.unresolved