Build.sh Fixes