Adapt to latest core changes.