Fixes for builder.sh