diff --git a/.evergreen/setup-spawn-host.sh b/.evergreen/setup-spawn-host.sh
index 1a526c762c..4109e59183 100755
--- a/.evergreen/setup-spawn-host.sh
+++ b/.evergreen/setup-spawn-host.sh
@@ -8,7 +8,8 @@ if [ -z "$1" ]
 fi
 
 target=$1
-remote_dir=/home/ec2-user/mongo-python-driver
+user=${target%@*}
+remote_dir=/home/$user/mongo-python-driver
 
 echo "Copying files to $target..."
 rsync -az -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:$remote_dir
diff --git a/.evergreen/sync-spawn-host.sh b/.evergreen/sync-spawn-host.sh
index 3d6c968901..de3374a008 100755
--- a/.evergreen/sync-spawn-host.sh
+++ b/.evergreen/sync-spawn-host.sh
@@ -6,9 +6,10 @@ if [ -z "$1" ]
 fi
 
 target=$1
+user=${target%@*}
 
 echo "Syncing files to $target..."
-rsync -haz -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:/home/ec2-user/mongo-python-driver
+rsync -haz -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:/home/$user/mongo-python-driver
 # shellcheck disable=SC2034
-fswatch -o . | while read f; do rsync -hazv -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:/home/ec2-user/mongo-python-driver; done
+fswatch -o . | while read f; do rsync -hazv -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:/home/$user/mongo-python-driver; done
 echo "Syncing files to $target... done."
diff --git a/_setup.py b/_setup.py
index 65ae1908fe..1a8b9e0246 100644
--- a/_setup.py
+++ b/_setup.py
@@ -82,6 +82,11 @@ def run(self):
             )
 
     def build_extension(self, ext):
+        # "ProgramFiles(x86)" is not a valid environment variable in Cygwin but is needed for
+        # the MSVCCompiler in distutils.
+        if os.name == "nt":
+            if "ProgramFiles" in os.environ and "ProgramFiles(x86)" not in os.environ:
+                os.environ["ProgramFiles(x86)"] = os.environ["ProgramFiles"] + " (x86)"
         name = ext.name
         try:
             build_ext.build_extension(self, ext)
diff --git a/pyproject.toml b/pyproject.toml
index 9a29a777fc..a9977a382c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -212,6 +212,7 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?)|dummy.*)$"
 "tools/*.py" = ["T201"]
 "green_framework_test.py" = ["T201"]
 "hatch_build.py" = ["S"]
+"_setup.py" = ["SIM112"]
 
 [tool.coverage.run]
 branch = true