Some changes on core.