Fix some other iterators going after end