diff --git a/6502/C64/Makefile b/6502/C64/Makefile
index c5acc40..505703b 100644
--- a/6502/C64/Makefile
+++ b/6502/C64/Makefile
@@ -132,7 +132,7 @@ test-lite-c16-.log: emulator/vf-lite-c16-.T64
 test-lite-x16.log: cbmfiles/vf-lite-x16 emulator/sdcard.img
 	rm -f cbmfiles/test.log
 	emulator/run-in-x16emu.sh vf-lite-x16 \
-	  "include run-lite-tests.fth\n1234567890\n"
+	  "INCLUDE RUN-LITE-TESTS.FTH\\X0D1234567890\\X0D"
 	mcopy -i emulator/sdcard.img ::TEST.LOG cbmfiles/test.log
 	petscii2ascii cbmfiles/test.log $@
 
diff --git a/6502/C64/emulator/run-in-x16emu.sh b/6502/C64/emulator/run-in-x16emu.sh
index 6912420..889dd2c 100755
--- a/6502/C64/emulator/run-in-x16emu.sh
+++ b/6502/C64/emulator/run-in-x16emu.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -e
-#set -x
 
 emulatordir="$(realpath --relative-to="$PWD" "$(dirname "${BASH_SOURCE[0]}")")"
 basedir="$(realpath --relative-to="$PWD" "${emulatordir}/..")"
@@ -10,6 +9,7 @@ sdcard="${emulatordir}/sdcard.img"
 mformat -i "${sdcard}" -F
 for asciifile in  $(cd "${cbmfilesdir}" && ls *.fth *fr)
 do
+  # Convert filename to PETSCII, remove trailing CR.
   petsciifile="$(echo ${asciifile} | ascii2petscii - |tr -d '\r')"
   mcopy -i "${sdcard}" "${cbmfilesdir}/$asciifile" "::${petsciifile}"
 done
@@ -22,21 +22,27 @@ fi
 
 keybuf=""
 warp=""
+scale=""
+debug=""
 if [ -n "$2" ]
 then
   keybuf="${2}"
   mcopy -i "${sdcard}" "${emulatordir}/notdone" "::NOTDONE"
   # warp="-warp"
+else
+  scale="-scale 2"
+  debug="-debug"
 fi
 
 x16emu \
   -keymap de \
-  -scale 2 \
-  -debug \
   -sdcard "${sdcard}" \
   $autostart \
   $warp \
+  $scale \
+  $debug \
   &
+  # -keybuf "$keybuf" \
 
 if [ -n "$keybuf" ]
 then