fix more deprecated warnings