diff --git a/common/legacy_gal/eda_draw_frame.cpp b/common/legacy_gal/eda_draw_frame.cpp
index 7198e07b2e..969d537ce0 100644
--- a/common/legacy_gal/eda_draw_frame.cpp
+++ b/common/legacy_gal/eda_draw_frame.cpp
@@ -530,14 +530,14 @@ void EDA_DRAW_FRAME::OnSelectGrid( wxCommandEvent& event )
         int index = m_gridSelectBox->GetSelection();
         wxASSERT( index != wxNOT_FOUND );
 
-        if( index == m_gridSelectBox->GetCount() - 2 )
+        if( index == int( m_gridSelectBox->GetCount() - 2 ) )
         {
             // this is the separator
             wxUpdateUIEvent dummy;
             OnUpdateSelectGrid( dummy );
             return;
         }
-        else if( index == m_gridSelectBox->GetCount() - 1 )
+        else if( index == int( m_gridSelectBox->GetCount() - 1 ) )
         {
             wxUpdateUIEvent dummy;
             OnUpdateSelectGrid( dummy );
diff --git a/common/legacy_wx/eda_draw_frame.cpp b/common/legacy_wx/eda_draw_frame.cpp
index 488b11957b..144f1c933f 100644
--- a/common/legacy_wx/eda_draw_frame.cpp
+++ b/common/legacy_wx/eda_draw_frame.cpp
@@ -531,14 +531,14 @@ void EDA_DRAW_FRAME::OnSelectGrid( wxCommandEvent& event )
         int index = m_gridSelectBox->GetSelection();
         wxASSERT( index != wxNOT_FOUND );
 
-        if( index == m_gridSelectBox->GetCount() - 2 )
+        if( index == int( m_gridSelectBox->GetCount() - 2 ) )
         {
             // this is the separator
             wxUpdateUIEvent dummy;
             OnUpdateSelectGrid( dummy );
             return;
         }
-        else if( index == m_gridSelectBox->GetCount() - 1 )
+        else if( index == int( m_gridSelectBox->GetCount() - 1 ) )
         {
             wxUpdateUIEvent dummy;
             OnUpdateSelectGrid( dummy );
diff --git a/pcbnew/event_handlers_tracks_vias_sizes.cpp b/pcbnew/event_handlers_tracks_vias_sizes.cpp
index 38c900edbc..73f218fcf5 100644
--- a/pcbnew/event_handlers_tracks_vias_sizes.cpp
+++ b/pcbnew/event_handlers_tracks_vias_sizes.cpp
@@ -119,12 +119,12 @@ void PCB_EDIT_FRAME::Tracks_and_Vias_Size_Event( wxCommandEvent& event )
     case ID_AUX_TOOLBAR_PCB_TRACK_WIDTH:
         ii = m_SelTrackWidthBox->GetSelection();
 
-        if( ii == m_SelViaSizeBox->GetCount() - 2 )
+        if( ii == int( m_SelViaSizeBox->GetCount() - 2 ) )
         {
             // this is the separator
             m_SelTrackWidthBox->SetSelection( GetDesignSettings().GetTrackWidthIndex() );
         }
-        else if( ii == m_SelTrackWidthBox->GetCount() - 1 )
+        else if( ii == int( m_SelTrackWidthBox->GetCount() - 1 ) )
         {
             m_SelTrackWidthBox->SetSelection( GetDesignSettings().GetTrackWidthIndex() );
             DoShowBoardSetupDialog( _( "Tracks & Vias" ) );
@@ -137,12 +137,12 @@ void PCB_EDIT_FRAME::Tracks_and_Vias_Size_Event( wxCommandEvent& event )
     case ID_AUX_TOOLBAR_PCB_VIA_SIZE:
         ii = m_SelViaSizeBox->GetSelection();
 
-        if( ii == m_SelViaSizeBox->GetCount() - 2 )
+        if( ii == int( m_SelViaSizeBox->GetCount() - 2 ) )
         {
             // this is the separator
             m_SelViaSizeBox->SetSelection( GetDesignSettings().GetViaSizeIndex() );
         }
-        else if( ii == m_SelViaSizeBox->GetCount() - 1 )
+        else if( ii == int( m_SelViaSizeBox->GetCount() - 1 ) )
         {
             m_SelViaSizeBox->SetSelection( GetDesignSettings().GetViaSizeIndex() );
             DoShowBoardSetupDialog( _( "Tracks & Vias" ) );