fixes for PaymentClient