Make specs green with latest Core changes.