Fix some increment errors