Fix stack-update failure, add verify steps