Update for interface API changes in core.