Small fixes to change the Map looked at for payment info, setting options and checking out now works again