More eshelf updates