fixes for ess mode