diff --git a/.air.toml b/.air.toml
index b4e7a93..680c96d 100644
--- a/.air.toml
+++ b/.air.toml
@@ -2,8 +2,8 @@ root = "."
 tmp_dir = "tmp"
 
 [build]
-  cmd = "go build -tags nofrontend -o ./tmp/renewcms.exe ./cmd/server"
-  bin = "tmp/renewcms.exe"
+  cmd = "go build -tags nofrontend -o ./tmp/renewcms ./cmd/server"
+  bin = "tmp/renewcms"
   delay = 500
   exclude_dir = ["tmp", "bin", "data", "web", "features", "docs", "internal/infrastructure/assets/dist", ".claude"]
   exclude_regex = ["_test.go"]
diff --git a/scripts/mutate.sh b/scripts/mutate.sh
index c99e246..b7d9478 100644
--- a/scripts/mutate.sh
+++ b/scripts/mutate.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-work="$root/tmp/mutate-work"
+work="${MUTATE_WORKDIR:-${XDG_CACHE_HOME:-$HOME/.cache}/renewcms-mutate}"
 rm -rf "$work"
 mkdir -p "$work"
 trap 'rm -rf "$work"' EXIT
diff --git a/test/update_download_test.go b/test/update_download_test.go
index 34f21f7..ab8ab43 100644
--- a/test/update_download_test.go
+++ b/test/update_download_test.go
@@ -22,6 +22,7 @@ import (
 	"runtime"
 	"strings"
 	"sync"
+	"syscall"
 	"testing"
 	"time"
 )
@@ -470,7 +471,7 @@ func (r *downloadRig) waitForJob(states ...string) update.Job {
 
 func assertStagedDirGone(t *testing.T, rig *downloadRig) {
 	t.Helper()
-	if _, err := os.Stat(rig.stagedDir()); !os.IsNotExist(err) {
+	if _, err := os.Stat(rig.stagedDir()); !os.IsNotExist(err) && !errors.Is(err, syscall.ENOTDIR) {
 		t.Errorf("staged directory still exists: %v", err)
 	}
 }