diff --git a/gemstone/justfile b/gemstone/justfile
index 614cd11c..56fbe05c 100644
--- a/gemstone/justfile
+++ b/gemstone/justfile
@@ -32,7 +32,7 @@ install-android-targets:
     cargo install cargo-ndk
 
 test-ios:
-    @xcodebuild -project tests/ios/GemTest/GemTest.xcodeproj \
+    @set -o pipefail && xcodebuild -project tests/ios/GemTest/GemTest.xcodeproj \
     -scheme GemTest \
     -sdk iphonesimulator \
     -destination "platform=iOS Simulator,name=iPhone 15" \
@@ -53,7 +53,7 @@ export GEN_KOTLIN_FOLDER := "generated/kotlin"
 export TARGET_XC_FW_FOLDER := "target/spm"
 export FW_FFI_NAME := FW_NAME + "FFI"
 export FW_FFI_FILE := FW_FFI_NAME + ".framework"
-export XC_FW_FFI_NAME := "FW_FFI_NAME" + ".xcframework"
+export XC_FW_FFI_NAME := FW_FFI_NAME + ".xcframework"
 export DEPLOYMENT_TARGET := env_var_or_default("IPHONEOS_DEPLOYMENT_TARGET", "16.0")
 
 build-ios: build-targets bindgen-swift assemble-frameworks xcframework cp-xcframework-source
@@ -73,13 +73,15 @@ bindgen-swift:
 
 assemble-frameworks:
     #!/usr/bin/env bash
-    cat << MODULE_MAP >/dev/null
+    MODULE_MAP=$(
+    cat << EOF
     // This file was autogenerated by some hot garbage in the uniffi crate.
     framework module ${FW_FFI_NAME} {
         header "${FW_FFI_NAME}.h"
         export *
     }
-    MODULE_MAP
+    EOF
+    )
     cd ${TARGET_DIR} && find . -type d -name ${FW_FFI_FILE} | xargs rm -rf
     for target in aarch64-apple-ios-sim aarch64-apple-ios aarch64-apple-ios-macabi; do \
         pushd ${TARGET_DIR}/${target}/${BUILD_MODE_TARGET} > /dev/null && \