fixes for more compilation errors