Fix the rest of the build