Fix up build scripts