Pickup erchef bug fixes 1.2.6