Fix the build properly.