Fix more compile errors