Fixed iterators in SDK