Fix the build some more.