Few more PayPal fixes. See #138