Fixed iterator var types