Updated the following files to fix the issues found in testing on payment
gateway integration.