Cleanly fix the build.