Minor tweak for updated Core.

Temperary until I can find time for a bigger rework.