Fix more build errors.