Fix up build process