Fix current build failures.