I have a follow-up PR for fixing stream settings.  This one, I just wanted to focus on minimum needed to address connection.