Fixed up my iterators