ES version and small fixes