Improvements to connection logic.