Fixup Bitpay integration