Fix failing core specs