itertools fixes