Fix the build process