build process fixes