More pre-increment fixes