Fix remaining specs.