More changes to allow bootstrap connection retries.