Small tweaks

Didn't actually add ESRI