Updates for recent core changes