Build script fixup