Fixups for changes in core.