Fix some GoCardless breaking changes