Fixed up some failing specs