Fixes for Connection and ConnectionManager