Adapt to the Core changes.