diff --git a/appvm/qubes_core_appvm b/appvm/qubes_core_appvm
index 32c0833..a4c2465 100755
--- a/appvm/qubes_core_appvm
+++ b/appvm/qubes_core_appvm
@@ -26,7 +26,7 @@ start()
 	fi
 
 	type=$(/usr/bin/xenstore-read qubes_vm_type)
-	if [ "$type" != "AppVM" -a "$type" != "DisposableVM" ]; then
+	if [ "$type" != "AppVM" -a "$type" != "DisposableVM" -a "$type" != "TemplateVM" ]; then
 		# This script runs only on AppVMs
 		return 0
 	fi
diff --git a/appvm/qvm-copy-to-vm b/appvm/qvm-copy-to-vm
index 4817b43..ff4d620 100755
--- a/appvm/qvm-copy-to-vm
+++ b/appvm/qvm-copy-to-vm
@@ -49,7 +49,7 @@ while true ; do
 	read agentpid sentsize agentstatus < $PROGRESS_FILE
 	if [ "x"$agentstatus = x ] ; then continue ; fi
 	if ! [ -e /proc/$agentpid ] ; then break ; fi
-	if [ "x"$agentstatus = xdone ] ; then break ; fi
+	if [ "x"$agentstatus = xDONE ] ; then break ; fi
 	CURRSIZE=$(($sentsize/1024))
 	if [ $DO_PROGRESS = 1 ] ; then 
 		echo -ne "\r sent $CURRSIZE/$SIZE KB                   "