diff --git a/pcbnew/class_module.cpp b/pcbnew/class_module.cpp
index 887c9d5753..9aced11a90 100644
--- a/pcbnew/class_module.cpp
+++ b/pcbnew/class_module.cpp
@@ -890,8 +890,11 @@ EDA_Rect MODULE::GetBoundingBox()
 
 
 /*******************************************************/
-void MODULE::Display_Infos( WinEDA_BasePcbFrame* frame )
+void MODULE::Display_Infos( WinEDA_DrawFrame* frame )
 /*******************************************************/
+/* Virtual function, from EDA_BaseStruct.
+ * display module info on MsgPanel
+*/
 {
     int      nbpad;
     char     bufcar[512], Line[512];
diff --git a/pcbnew/class_module.h b/pcbnew/class_module.h
index bc65e624f8..9cbfd729c9 100644
--- a/pcbnew/class_module.h
+++ b/pcbnew/class_module.h
@@ -195,7 +195,7 @@ public:
      * about this object into the frame's message panel.
      * @param frame A WinEDA_DrawFrame in which to print status information.
      */
-    void    Display_Infos( WinEDA_BasePcbFrame* frame );
+    void    Display_Infos( WinEDA_DrawFrame* frame );
 
 
     /**
diff --git a/pcbnew/controle.cpp b/pcbnew/controle.cpp
index d06abe589d..4260eeebc1 100644
--- a/pcbnew/controle.cpp
+++ b/pcbnew/controle.cpp
@@ -122,8 +122,8 @@ BOARD_ITEM* WinEDA_BasePcbFrame::PcbGeneralLocateAndDisplay( int aHotKeyCode )
         (*m_Collector)[i]->Show( 0, std::cout );
 #endif
 
-    /* Remove redundancies: most of time, zones are found twice,
-     * because zones are filled twice ( once by by horizontal and once by vertical segments )
+    /* Remove redundancies: sometime, zones are found twice,
+     * because zones can be are filled by overlapping segments (this is a fill option)
      */
     unsigned long timestampzone = 0;
 
@@ -163,6 +163,7 @@ BOARD_ITEM* WinEDA_BasePcbFrame::PcbGeneralLocateAndDisplay( int aHotKeyCode )
     {
         SetCurItem( item );
     }
+
     else    // we can't figure out which item user wants, do popup menu so user can choose
     {
         wxMenu itemMenu;
diff --git a/pcbnew/moduleframe.cpp b/pcbnew/moduleframe.cpp
index dedff987c1..2c6ee8e5d0 100644
--- a/pcbnew/moduleframe.cpp
+++ b/pcbnew/moduleframe.cpp
@@ -346,11 +346,9 @@ void WinEDA_ModuleEditFrame::SetToolbars()
 
     if( m_AuxiliaryToolBar )
     {
-        int jj;
+        unsigned jj;
         if( m_SelZoomBox )
         {
-            int old_choice = m_SelZoomBox->GetChoice();
-
             for( jj = 0; jj < GetScreen()->m_ZoomList.GetCount(); jj++ )
             {
                 if( GetScreen()->GetZoom() == GetScreen()->m_ZoomList[jj] )