Fix re-connecting after recent commits