Fix more build issues