Coping with changes to core