diff --git a/bin/bootrr-generate-template b/bin/bootrr-generate-template
index 42866dc..829224a 100755
--- a/bin/bootrr-generate-template
+++ b/bin/bootrr-generate-template
@@ -30,8 +30,8 @@ for driver_path in /sys/bus/*/drivers/* ; do
 
 	# Check for each instance of the driver
 	find "$driver_path" -type l | grep -v module$ | while read -r dev ; do
-		d=$(cd ${dev} ; pwd -P | sed s,.*/,,)
-		echo assert_device_present ${d}-probed \"${driver}\" ${d}
+		d="$(cd "${dev}" ; pwd -P | sed s,.*/,,)"
+		echo assert_device_present \"${d}-probed\" \"${driver}\" \"${d}\"
 	done
 
 	echo
diff --git a/helpers/timeout b/helpers/timeout
index e713cd6..1279663 100755
--- a/helpers/timeout
+++ b/helpers/timeout
@@ -6,11 +6,10 @@ if [ $# -lt 2 ]; then
 fi
 
 attempts="$1"; shift
-cmd="$@"
 
 for i in `seq ${attempts}`
 do
-	$cmd && exit 0 
+	"$@" && exit 0
 	sleep 1
 done