Fix up failing specs