Fix failing specs due to recent merge