Authorize.net and Paypoint fixes