diff --git a/eeschema/class_library.cpp b/eeschema/class_library.cpp
index 6dfb817ead..a23ed94c7c 100644
--- a/eeschema/class_library.cpp
+++ b/eeschema/class_library.cpp
@@ -175,6 +175,17 @@ CMP_LIB_ENTRY* CMP_LIBRARY::FindEntry( const wxChar* aName, LibrEntryType aType
     return NULL;
 }
 
+/**
+ * Return the first entry in the library.
+ * @return The first entry or NULL if the library has no entries.
+ */
+CMP_LIB_ENTRY* CMP_LIBRARY::GetFirstEntry()
+{
+    if( entries.size() )
+        return &entries.front();
+    else
+        return NULL;
+}
 
 LIB_COMPONENT* CMP_LIBRARY::FindComponent( const wxChar* aName )
 {
diff --git a/eeschema/class_library.h b/eeschema/class_library.h
index bce366156b..8e7386172f 100644
--- a/eeschema/class_library.h
+++ b/eeschema/class_library.h
@@ -317,10 +317,7 @@ public:
      *
      * @return The first entry or NULL if the library has no entries.
      */
-    CMP_LIB_ENTRY* GetFirstEntry()
-    {
-        return &entries.front();
-    }
+    CMP_LIB_ENTRY* GetFirstEntry();
 
     /**
      * Find next library entry by /a aName.
diff --git a/eeschema/netlist.cpp b/eeschema/netlist.cpp
index 166c87d67f..aa521546ff 100644
--- a/eeschema/netlist.cpp
+++ b/eeschema/netlist.cpp
@@ -706,7 +706,7 @@ static int ConvertBusToMembers( NETLIST_OBJECT_LIST& aNetItemBuffer,
     else
         BusLabel.m_Type = NET_BUSLABELMEMBER;
 
-    /* Conversion of BusLabel in the root of the Label + the number of wire. */
+    /* Conversion of BusLabel to the root Label name + the member id like mybus0, mybus1 ... */
     BufLine = BusLabel.m_Label->Left( RootBusNameLength );
 
     BusMember = FirstNumWireBus;
@@ -721,8 +721,7 @@ static int ConvertBusToMembers( NETLIST_OBJECT_LIST& aNetItemBuffer,
         NETLIST_OBJECT* new_label = new NETLIST_OBJECT( BusLabel );
         NumItem++;
 
-        /* Conversion of BusLabel in the root of the Label + the number
-         * of wire */
+        /* Conversion of BusLabel to the root name + the current member id.*/
         BufLine = BusLabel.m_Label->Left( RootBusNameLength );
         BufLine << BusMember;
         new_label->m_Label = new wxString( BufLine );
@@ -739,7 +738,7 @@ static int ConvertBusToMembers( NETLIST_OBJECT_LIST& aNetItemBuffer,
  * PropageNetCode propagates Netcode NewNetCode on all elements
  * belonging to the former Netcode OldNetCode
  * If IsBus == 0; Netcode is the member who is spreading
- * If IsBus! = 0; is the member who is spreading BusNetCode
+ * If IsBus != 0; is the member who is spreading BusNetCode
  */
 static void PropageNetCode( int OldNetCode, int NewNetCode, int IsBus )
 {