fix more compile errors