minor fixes to charge/pay implementation