Fix the build the rest of the way.