Fix issues around payment method refresh logic