Minor fixes so that the iterator iterates and doesn't cause an infinate loop when these functions are accessed.