fixes for compilation errors