Fix issues in payment code.