Fix bugs in payment/refunds introduced during currency conversion (test stage)