fix more compile issues