Fixed zip warnings and one of the iterator access issues