Misc binary_build.sh cleanups