Fix failing specs, again