Fixes for including BUILD_NAME