Fixed es client errors