Iterator fixes