Fix more build tests.