fix more esri changes