build.bash style tweaks