Make iterators work on 3.x