fix more compilation issues