Update to work with current ActiveMerchant, fix the build