diff --git a/appvm/qvm-copy-to-vm b/appvm/qvm-copy-to-vm
index bcf333d..26ee876 100755
--- a/appvm/qvm-copy-to-vm
+++ b/appvm/qvm-copy-to-vm
@@ -40,4 +40,4 @@ if [ $PROGRESS_TYPE = console ] ; then
 	export FILECOPY_TOTAL_SIZE=$(du --apparent-size -c "$@" | tail -1 | cut -f 1)
 fi
 
-exec /usr/lib/qubes/qrexec_client_vm /usr/lib/qubes/qfile-agent $VM qubes.Filecopy "$@"
+exec /usr/lib/qubes/qrexec_client_vm $VM qubes.Filecopy /usr/lib/qubes/qfile-agent "$@"
diff --git a/appvm/qvm-copy-to-vm2.gnome b/appvm/qvm-copy-to-vm2.gnome
index be9dc7e..cb2b86e 100755
--- a/appvm/qvm-copy-to-vm2.gnome
+++ b/appvm/qvm-copy-to-vm2.gnome
@@ -27,8 +27,7 @@ SIZE=$(du --apparent-size -c "$@" | tail -1 | cut -f 1)
 
 export PROGRESS_TYPE=gui
 
-/usr/lib/qubes/qrexec_client_vm /usr/lib/qubes/qfile-agent \
-	$VM qubes.Filecopy "$@" | 
+/usr/lib/qubes/qrexec_client_vm $VM qubes.Filecopy /usr/lib/qubes/qfile-agent "$@" |
 (while read sentsize ; do
 	CURRSIZE=$(($sentsize/1024))
 	echo $((100*$CURRSIZE/$SIZE))
diff --git a/appvm/qvm-copy-to-vm2.kde b/appvm/qvm-copy-to-vm2.kde
index 478df92..5c56df0 100755
--- a/appvm/qvm-copy-to-vm2.kde
+++ b/appvm/qvm-copy-to-vm2.kde
@@ -29,8 +29,8 @@ qdbus $REF org.freedesktop.DBus.Properties.Set "" maximum $SIZE
 
 export PROGRESS_TYPE=gui
 
-/usr/lib/qubes/qrexec_client_vm /usr/lib/qubes/qfile-agent \
-	$VM qubes.Filecopy "$@" | 
+/usr/lib/qubes/qrexec_client_vm $VM qubes.Filecopy \
+	/usr/lib/qubes/qfile-agent "$@" | 
 (while read sentsize ; do
 	CURRSIZE=$(($sentsize/1024))
 	qdbus $REF  org.freedesktop.DBus.Properties.Set "" value $CURRSIZE
diff --git a/appvm/qvm-open-in-dvm2 b/appvm/qvm-open-in-dvm2
index 365c564..dcc7195 100755
--- a/appvm/qvm-open-in-dvm2
+++ b/appvm/qvm-open-in-dvm2
@@ -25,4 +25,4 @@ if ! [ $# = 1 ] ; then
 	exit 1
 fi
 
-exec /usr/lib/qubes/qrexec_client_vm "/usr/lib/qubes/qopen-in-vm" dispvm qubes.OpenInVM "$1"
+exec /usr/lib/qubes/qrexec_client_vm dispvm qubes.OpenInVM "/usr/lib/qubes/qopen-in-vm" "$1"
diff --git a/appvm/qvm-open-in-vm b/appvm/qvm-open-in-vm
index dc77ffe..ffd087e 100755
--- a/appvm/qvm-open-in-vm
+++ b/appvm/qvm-open-in-vm
@@ -25,4 +25,4 @@ if ! [ $# = 2 ] ; then
 	exit 1
 fi
 
-exec /usr/lib/qubes/qrexec_client_vm "/usr/lib/qubes/qopen-in-vm" "$1" qubes.OpenInVM "$2"
+exec /usr/lib/qubes/qrexec_client_vm "$1" qubes.OpenInVM "/usr/lib/qubes/qopen-in-vm" "$2"
diff --git a/common/qubes_trigger_sync_appmenus.sh b/common/qubes_trigger_sync_appmenus.sh
index de258c6..5390c2d 100755
--- a/common/qubes_trigger_sync_appmenus.sh
+++ b/common/qubes_trigger_sync_appmenus.sh
@@ -3,5 +3,5 @@
 UPDATEABLE=`/usr/bin/xenstore-read qubes_vm_updateable`
 
 if [ "$UPDATEABLE" = "True" ]; then
-    /usr/lib/qubes/qrexec_vm /bin/grep dom0 qubes.SyncAppMenus -H = /usr/share/applications/*.desktop
+    /usr/lib/qubes/qrexec_client_vm dom0 qubes.SyncAppMenus /bin/grep -H = /usr/share/applications/*.desktop
 fi