Fix setting of Z for inc/dec