diff --git a/Sources/VLAppController.mm b/Sources/VLAppController.mm
index cdccfa8..714a8aa 100644
--- a/Sources/VLAppController.mm
+++ b/Sources/VLAppController.mm
@@ -100,7 +100,7 @@
 {
 	NSString * cmd 	= 
 		[NSString stringWithFormat:
-						  @"%@ --version | head -1 | awk '{ print $3 }'",
+						  @"\"%@\" --version | head -1 | awk '{ print $3 }'",
 					  path];
 	return [self getLineFromCommand:cmd];
 }
diff --git a/Tools/lameWrapper b/Tools/lameWrapper
index 281218a..6716404 100755
--- a/Tools/lameWrapper
+++ b/Tools/lameWrapper
@@ -1,3 +1,3 @@
 #!/bin/bash -l
 
-exec lame "$*"
+exec lame "$@"
diff --git a/Tools/lilyWrapper b/Tools/lilyWrapper
index 50b1ab0..695628a 100755
--- a/Tools/lilyWrapper
+++ b/Tools/lilyWrapper
@@ -1,7 +1,4 @@
 #!/bin/bash -l
 
-export PATH="`dirname $1`":$PATH
-exec $*
-
-
-
+export PATH="`dirname "$1"`":$PATH
+exec "$@"
diff --git a/Tools/mmaWrapper b/Tools/mmaWrapper
index ace5274..c717544 100755
--- a/Tools/mmaWrapper
+++ b/Tools/mmaWrapper
@@ -1,4 +1,4 @@
 #!/bin/sh -l
 
 cd "${0%/*/*}"/share/mma
-exec "${0%/*}"/mma.py $*
+exec "${0%/*}"/mma.py "$@"