diff --git a/eeschema/connection_graph.cpp b/eeschema/connection_graph.cpp
index 9e9e603a86..416f5cdcea 100644
--- a/eeschema/connection_graph.cpp
+++ b/eeschema/connection_graph.cpp
@@ -1107,7 +1107,10 @@ void CONNECTION_GRAPH::buildConnectionGraph()
                                                                        aSubgraph->m_sheet );
                             c->SetName( static_cast<SCH_PIN *>( possible_driver )->GetName() );
                             connections_to_check.push_back( c );
-                            wxLogTrace( "CONN", "Adding secondary pin %s", c->Name( true ) );
+                            wxLogTrace( "CONN", "%lu (%s): Adding secondary pin %s",
+                                        aSubgraph->m_code,
+                                        aSubgraph->m_driver_connection->Name( true ),
+                                        c->Name( true ) );
                         }
                         break;
                     }
@@ -1120,7 +1123,10 @@ void CONNECTION_GRAPH::buildConnectionGraph()
                                                                    aSubgraph->m_sheet );
                         c->SetName( static_cast<SCH_TEXT*>( possible_driver )->GetShownText() );
                         connections_to_check.push_back( c );
-                        wxLogTrace( "CONN", "Adding secondary label %s", c->Name( true ) );
+                        wxLogTrace( "CONN", "%lu (%s): Adding secondary label %s",
+                                    aSubgraph->m_code,
+                                    aSubgraph->m_driver_connection->Name( true ),
+                                    c->Name( true ) );
                         break;
                     }
 
diff --git a/eeschema/sch_item_struct.cpp b/eeschema/sch_item_struct.cpp
index 8a83db6973..c6bf750d8e 100644
--- a/eeschema/sch_item_struct.cpp
+++ b/eeschema/sch_item_struct.cpp
@@ -117,6 +117,7 @@ SCH_CONNECTION*  SCH_ITEM::InitializeConnection( const SCH_SHEET_PATH& aSheet )
     if( Connection( aSheet ) )
     {
         Connection( aSheet )->Reset();
+        Connection( aSheet )->SetSheet( aSheet );
         return Connection( aSheet );
     }