Fixed some iteration stuff