fix more compilation problems