Fix the build & tests.