Fix more compilation errors