Payment flow fixes