Some adjustments to build.sh