fixes for ES >= 1.x.x