Fix failing over to another bucket/host