Little ESS tweaks