Fixing some more tricky issues with connecting and reconnecting, main around reconnecting while dead.