Minimal update for changes in core.