fix more compilation errors