diff --git a/dev-scripts/ubuntu_build_x86_86-w64-mingw32-gcc.sh b/dev-scripts/ubuntu_build_x86_86-w64-mingw32-gcc.sh
index 29a10b7c..fabf0025 100755
--- a/dev-scripts/ubuntu_build_x86_86-w64-mingw32-gcc.sh
+++ b/dev-scripts/ubuntu_build_x86_86-w64-mingw32-gcc.sh
@@ -40,12 +40,12 @@ esac
 set -euo pipefail
 
 # Get the current project root (this file is in <root>/dev-scripts/ and gets called via just (just file is at <root>/justfile))
-SRC_TAURI_DIR="$(pwd)/../src-tauri"
+SRC_TAURI_DIR="$PWD/../src-tauri"
 
 # Check if src-tauri directory exists
 if [ ! -d "$SRC_TAURI_DIR" ]; then
     echo "Error: must be called from project root -> src-tauri must be subdir"
-    echo "Current directory: $(pwd)"
+    echo "Current directory: $PWD"
     exit 1
 fi
 
@@ -93,7 +93,7 @@ download_if_missing() {
         echo "Already present: $dest"
     else
         echo "Downloading: $url"
-        wget -q "$url" -O "$dest"
+        wget --retry-connrefused -t 20 -nv "$url" -O "$dest"
     fi
 }
 
diff --git a/justfile b/justfile
index addd94ef..84226f20 100644
--- a/justfile
+++ b/justfile
@@ -83,12 +83,12 @@ swap:
 
 # Run the asb on testnet
 asb-testnet:
-	ASB_DEV_ADDR_OUTPUT_PATH="$(pwd)/src-gui/.env.development" cargo run -p swap-asb --bin asb -- --testnet --trace start --rpc-bind-port 9944 --rpc-bind-host 0.0.0.0
+	ASB_DEV_ADDR_OUTPUT_PATH="$PWD/src-gui/.env.development" cargo run -p swap-asb --bin asb -- --testnet --trace start --rpc-bind-port 9944 --rpc-bind-host 0.0.0.0
 
 # Launch the ASB controller REPL against a local testnet ASB instance
 asb-testnet-controller:
 	cargo run -p swap-controller --bin asb-controller -- --url http://127.0.0.1:9944
-	
+
 # Updates our submodules (currently only Monero C++ codebase)
 update_submodules:
 	cd monero-sys && git submodule update --init --recursive --force
diff --git a/regenerate_sqlx_cache.sh b/regenerate_sqlx_cache.sh
index 87130bc4..659b9cc8 100755
--- a/regenerate_sqlx_cache.sh
+++ b/regenerate_sqlx_cache.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 # regenerate_sqlx_cache.sh
-# 
+#
 # Script to regenerate SQLx query cache for monero-rpc-pool
-# 
+#
 # This script:
 # 1. Creates a temporary SQLite database in the workspace root
 # 2. Runs all database migrations to set up the schema
@@ -25,7 +25,7 @@ set -e  # Exit on any error
 
 echo "🔄 Regenerating SQLx query cache..."
 
-WORKSPACE_ROOT="$(pwd)"
+WORKSPACE_ROOT="$PWD"
 
 # Use shared temporary database in workspace root
 TEMP_DB="$WORKSPACE_ROOT/tempdb.sqlite"
@@ -51,4 +51,4 @@ cargo sqlx prepare --workspace
 
 echo "✅ SQLx query cache regenerated successfully!"
 echo "📝 The .sqlx directory has been updated with the latest query metadata."
-echo "💡 Make sure to commit the .sqlx directory to version control." 
\ No newline at end of file
+echo "💡 Make sure to commit the .sqlx directory to version control."