Bug fixes for ArcGIS.