Improving/fixing build script for BB Black