Use pre-increment for iterators (cppcheck complains otherwise)
More pre-increment fixes