Build.sh improvements