diff --git a/.github/workflows/CompileWindows.yml b/.github/workflows/CompileWindows.yml
index 5acb16f2ee..402f031e7a 100644
--- a/.github/workflows/CompileWindows.yml
+++ b/.github/workflows/CompileWindows.yml
@@ -201,7 +201,7 @@ jobs:
     - name: 0a-1_ninja_fauxbuild
       if: fromJSON(inputs.fstuple).fauxbuild != ''
       run: |
-        fsvr_step 0a-1_ninja_fauxbuild {{ fromJSON(inputs.fstuple).fauxbuild }}
+        fsvr_step 0a-1_ninja_fauxbuild ${{ fromJSON(inputs.fstuple).fauxbuild }}
 
     - name: 089_ninja_build accomodate mis-manifested llwebrtc
       if: fromJSON(inputs.fstuple).fauxbuild == ''
diff --git a/bashland/restat-only-xxx.cpp b/bashland/restat-only-xxx.cpp
index 1694db4d38..1340354496 100644
--- a/bashland/restat-only-xxx.cpp
+++ b/bashland/restat-only-xxx.cpp
@@ -39,7 +39,7 @@ std::string get_tool_name(int argc, char* argv[]) {
 
 std::string get_artifact_name(int argc, char* argv[]) {
   std::string artifact_filename;
-  std::regex artifact_regex("[-/](?:Fo|out:)([^ ]+)");
+  std::regex artifact_regex("[-/](?:Fo|out:)[ ]*([^ ]+)");
   std::cmatch match;
 
   for (int i = 1; i < argc; ++i) {
diff --git a/util/build.sh b/util/build.sh
index c58975cf64..53359ca432 100755
--- a/util/build.sh
+++ b/util/build.sh
@@ -225,9 +225,13 @@ EOF
 _cl_exe=$cl_exe
 _lib_exe=$lib_exe
 _link_exe=$link_exe
+_cmcldeps_exe=$cmcldeps_exe
+_rc_exe=$rc_exe
 cl_exe=restat-only-cl.exe
 lib_exe=restat-only-lib.exe
 link_exe=restat-only-link.exe
+cmcldeps_exe=true.exe
+rc_exe=true.exe
 EOF
 
 )}