Client build process fixes