Sync bootstrap.sh with build.sh