Cybersource fixes

Cherry-picked from MIT's branch.