Fix more build errors