Fix broken specs in core.