Fix failing specs
More fixes