Fixing iterators and operators