Enhanced dobuild.sh