Fixed auto-incrementing and arch16N