Fix generic iterator implementation
Fix typo