Fix failing build tests.