Some fixes to reflect the changes in core.