Fix up build script?