Minor build script cleanup