fix more deprecation warnings