diff --git a/skills/scripts/case-guard.sh b/skills/scripts/case-guard.sh
index b873b78..dc66d8f 100755
--- a/skills/scripts/case-guard.sh
+++ b/skills/scripts/case-guard.sh
@@ -15,7 +15,7 @@ while [[ $# -gt 0 ]]; do
     -Force|--force) FORCE=1; shift ;;
     -Quiet|--quiet) QUIET=1; shift ;;
     -h|--help) sed -n '2,6p' "$0"; exit 0 ;;
-    *) echo "Unknown arg: $1" >&2; exit 1 ;;
+    *) echo "Unknown arg: \"$1\"" >&2; exit 1 ;;
   esac
 done
 
diff --git a/skills/scripts/case-init.sh b/skills/scripts/case-init.sh
index eecc473..a20f54a 100755
--- a/skills/scripts/case-init.sh
+++ b/skills/scripts/case-init.sh
@@ -39,7 +39,7 @@ while [[ $# -gt 0 ]]; do
     -h|--help) sed -n '2,8p' "$0"; exit 0 ;;
     *)
       if [[ -z "$HINT" && "$1" != -* ]]; then HINT="$1"; shift
-      else echo "Unknown arg: $1" >&2; exit 2; fi
+      else echo "Unknown arg: \"$1\"" >&2; exit 2; fi
       ;;
   esac
 done
diff --git a/skills/scripts/master-route.sh b/skills/scripts/master-route.sh
index 02023ec..9d67883 100755
--- a/skills/scripts/master-route.sh
+++ b/skills/scripts/master-route.sh
@@ -18,7 +18,7 @@ while [[ $# -gt 0 ]]; do
       ;;
     *)
       if [[ -z "$HINT" && "$1" != -* ]]; then HINT="$1"; shift
-      else echo "Unknown arg: $1" >&2; exit 2; fi
+      else echo "Unknown arg: \"$1\"" >&2; exit 2; fi
       ;;
   esac
 done
diff --git a/skills/scripts/scan-leaks.ps1 b/skills/scripts/scan-leaks.ps1
index 47c2370..c556da3 100644
--- a/skills/scripts/scan-leaks.ps1
+++ b/skills/scripts/scan-leaks.ps1
@@ -67,7 +67,7 @@ foreach ($t in $targets) {
         if ($p.Name -eq 'Email' -and (Test-EmailAllowed $m.Value)) { continue }
         $findings++
         $kind = if ($ReportOnly) { 'warning' } else { 'error' }
-        Write-Host "::$kind file=$($t.FullName),line=$($i + 1)::$($p.Name): $($m.Value)"
+        Write-Host "::$kind file=$($t.FullName),line=$($i + 1)::$($p.Name): $($m.Value -replace "\r","%0D" -replace "\n","%0A")"
       }
     }
   }