Adjust for core changes