Improvements in build.sh