fixing build issues due to changes in ES