diff --git a/qubes-sflc/build.sh b/qubes-sflc/build.sh
index d3c19e6..17dcccd 100755
--- a/qubes-sflc/build.sh
+++ b/qubes-sflc/build.sh
@@ -38,4 +38,4 @@ cp shufflecake-c/shufflecake "$PWD/shufflecake"
 
 # Restore the original crypto.h to avoid interference with future updates
 cd shufflecake-c
-git restore "shufflecake-c/$CRYPTO_H"
+git restore $CRYPTO_H
diff --git a/tools/surgeon-suture b/tools/surgeon-suture
index f11de89..f32525b 100755
--- a/tools/surgeon-suture
+++ b/tools/surgeon-suture
@@ -20,10 +20,10 @@ set -u
 
 # Patch create-snapshot
 rm -f /sysroot/usr/lib/qubes/create-snapshot
-cp /usr/share/scripts/create-snapshot.sh /sysroot/usr/lib/qubes/create-snapshot
+cp /usr/local/share/scripts/create-snapshot.sh /sysroot/usr/lib/qubes/create-snapshot              || true
 
 # Patch config.py to allow for higher Qube IDs
-sed 's/^max_qid = .*$/max_qid = 100000/' /usr/lib/python3.11/site-packages/qubes/config.py
+sed 's/^max_qid = .*$/max_qid = 100000/' /sysroot/usr/lib/python3.11/site-packages/qubes/config.py || true
 
 # Reassemble qubes.xml
 qubes_xml='/sysroot/var/lib/qubes/qubes.xml'