Extensions: Some fixes for PayPal extensions