Fixed (stupid) iterator mistakes