Fixup build scripts