More Iterator
fixes