diff --git a/.github/workflows/static-graphics-musl.yml b/.github/workflows/static-graphics-musl.yml
index 3086d0f..728b27f 100644
--- a/.github/workflows/static-graphics-musl.yml
+++ b/.github/workflows/static-graphics-musl.yml
@@ -70,6 +70,7 @@ jobs:
             sh -lc '
               set -e
               apk add --no-cache bash ca-certificates git python3 py3-httplib2 py3-pysocks py3-six clang compiler-rt lld llvm g++ ninja pkgconf fontconfig-dev glib-dev mesa-dev libx11-dev libxcb-dev libxext-dev pciutils-dev linux-headers perl curl tar xz patch gcompat libc6-compat
+              git config --global --add safe.directory "*"
               python3 - <<'"'"'PY'"'"'
           import pathlib
           import httplib2
diff --git a/scripts/build-windows-static-graphics.ps1 b/scripts/build-windows-static-graphics.ps1
index a057cc8..d39cb51 100644
--- a/scripts/build-windows-static-graphics.ps1
+++ b/scripts/build-windows-static-graphics.ps1
@@ -360,7 +360,7 @@ function Patch-WinX86SkiaLinker($SkiaDir) {
 
     $linkerPath = Join-Path $SkiaDir "src\c\sk_linker.cpp"
     $text = Get-Content -Path $linkerPath -Raw
-    $pattern = '(?m)^    skjson::ObjectValue\* a = nullptr;\r?\n    auto r = \(\*a\)\["tmp"\]\.getType\(\);$'
+    $pattern = '(?m)^    skjson::ObjectValue\* a = nullptr;\r?\n    auto r = \(\*a\)\["tmp"\]\.getType\(\);\r?$'
     $patched = [regex]::Replace($text, $pattern, '    int r = 0;')
     if ($patched -eq $text) {
         throw "Unable to patch win-x86 sk_linker JSON keep-alive references."