Some fixes for compilation errors