Fix more compile time errors