updating to work with recent core-overlay changes