Stripe integration fixes according to Tom's feedback - fix #552