Fix failing specs and features