diff --git a/scripts/build-android.sh b/scripts/build-android.sh
index 76176f1..e6893df 100755
--- a/scripts/build-android.sh
+++ b/scripts/build-android.sh
@@ -28,15 +28,15 @@ fi
 
 # Map Rust target -> Android ABI -> NDK toolchain target
 declare -A TARGET_ABI=(
-  [aarch64-linux-android]="arm64-v8a"
-  [armv7-linux-androideabi]="armeabi-v7a"
-  [x86_64-linux-android]="x86_64"
+  ["aarch64-linux-android"]="arm64-v8a"
+  ["armv7-linux-androideabi"]="armeabi-v7a"
+  ["x86_64-linux-android"]="x86_64"
 )
 
 declare -A TARGET_CC=(
-  [aarch64-linux-android]="aarch64-linux-android21-clang"
-  [armv7-linux-androideabi]="armv7a-linux-androideabi21-clang"
-  [x86_64-linux-android]="x86_64-linux-android21-clang"
+  ["aarch64-linux-android"]="aarch64-linux-android21-clang"
+  ["armv7-linux-androideabi"]="armv7a-linux-androideabi21-clang"
+  ["x86_64-linux-android"]="x86_64-linux-android21-clang"
 )
 
 # Find the NDK toolchain bin directory
@@ -61,8 +61,8 @@ echo "    Crates: ${CRATES[*]}"
 echo ""
 
 for target in "${!TARGET_ABI[@]}"; do
-  abi="${TARGET_ABI[$target]}"
-  cc="${TARGET_CC[$target]}"
+  abi="${TARGET_ABI["$target"]}"
+  cc="${TARGET_CC["$target"]}"
   echo "  ── $target ($abi) ──"
 
   # Set linker/compiler for this target via CARGO_TARGET env vars
@@ -71,6 +71,7 @@ for target in "${!TARGET_ABI[@]}"; do
   export "CARGO_TARGET_${target_upper}_LINKER=$TOOLCHAIN/$cc"
   export "CC_${target//-/_}=$TOOLCHAIN/$cc"
   export "AR_${target//-/_}=$TOOLCHAIN/llvm-ar"
+  export PATH="$TOOLCHAIN:$PATH"
 
   for crate in "${CRATES[@]}"; do
     echo "    Building $crate..."
@@ -96,7 +97,7 @@ done
 
 echo "==> Done. Libraries:"
 for target in "${!TARGET_ABI[@]}"; do
-  abi="${TARGET_ABI[$target]}"
+  abi="${TARGET_ABI["$target"]}"
   echo "  $abi:"
   ls -lh "$OUT_DIR/$abi/"*.so
 done
diff --git a/scripts/build-ios.sh b/scripts/build-ios.sh
index 977dd67..ca70e0e 100755
--- a/scripts/build-ios.sh
+++ b/scripts/build-ios.sh
@@ -23,13 +23,13 @@ TARGETS=(
 
 # Libraries to build and package
 declare -A LIB_NAMES=(
-  [salvium-crypto]="libsalvium_crypto"
-  [salvium-ffi]="libsalvium_ffi"
+  ["salvium-crypto"]="libsalvium_crypto"
+  ["salvium-ffi"]="libsalvium_ffi"
 )
 
 declare -A FRAMEWORK_NAMES=(
-  [salvium-crypto]="SalviumCrypto"
-  [salvium-ffi]="SalviumFfi"
+  ["salvium-crypto"]="SalviumCrypto"
+  ["salvium-ffi"]="SalviumFfi"
 )
 
 echo "==> Building Salvium libraries for iOS targets..."
@@ -48,8 +48,8 @@ echo "==> Creating xcframeworks..."
 mkdir -p "$WORK_DIR"
 
 for crate in "${!LIB_NAMES[@]}"; do
-  lib="${LIB_NAMES[$crate]}"
-  framework="${FRAMEWORK_NAMES[$crate]}"
+  lib="${LIB_NAMES["$crate"]}"
+  framework="${FRAMEWORK_NAMES["$crate"]}"
 
   echo "  -> $framework.xcframework"