Fix remaining failing specs.