diff --git a/bin/terractl b/bin/terractl
index eccfa68..6c93854 100755
--- a/bin/terractl
+++ b/bin/terractl
@@ -567,7 +567,8 @@ command=$1; shift
 case $command in
   -h|--help|help) usage 0 ;;
   -V|--version|version)
-    if [[ $TERRACTL_VERSION == "@"VERSION"@" ]]; then echo "terractl (development copy)"
+    # The build replaces the placeholder with a version number, which never contains '@'
+    if [[ $TERRACTL_VERSION == *@* ]]; then echo "terractl (development copy)"
     else echo "terractl $TERRACTL_VERSION"; fi
     exit 0 ;;
   list) cmd_list; exit ;;
diff --git a/packaging/deb/prerm b/packaging/deb/prerm
index 2c60dac..aa217ce 100755
--- a/packaging/deb/prerm
+++ b/packaging/deb/prerm
@@ -10,7 +10,7 @@ case "$1" in
             units=$(systemctl list-units --plain --no-legend --all 'terraria@*.service' | awk '{print $1}')
             if [ -n "$units" ]; then
                 echo "Stopping Terraria instances: $units"
-                systemctl stop $units || true
+                systemctl stop "$units" || true
             fi
         fi
         ;;