Paypal & Plan fix