Some changes to the core.