Some fixes to the incrementing and decrementing.