more fixes to ES push