Fix remaining specs