Minor tweaks to improve Braintree integration