Fixes to allow paying with a saved card