Fix copy and internal iterator