Fix failing specs (I think)