Minor changes to Iterator class