diff --git a/eeschema/dialogs/dialog_fields_editor_global.cpp b/eeschema/dialogs/dialog_fields_editor_global.cpp
index 5e6c443ee6..f02b190e69 100644
--- a/eeschema/dialogs/dialog_fields_editor_global.cpp
+++ b/eeschema/dialogs/dialog_fields_editor_global.cpp
@@ -94,7 +94,7 @@ public:
     {
         m_fieldNames.push_back( aFieldName );
 
-        for( int i = 0; i < m_componentRefs.GetCount(); ++i )
+        for( unsigned i = 0; i < m_componentRefs.GetCount(); ++i )
         {
             SCH_COMPONENT* comp = m_componentRefs[ i ].GetComp();
             timestamp_t compID = comp->GetTimeStamp();
@@ -287,7 +287,7 @@ public:
     {
         m_rows.clear();
 
-        for( int i = 0; i < m_componentRefs.GetCount(); ++i )
+        for( unsigned i = 0; i < m_componentRefs.GetCount(); ++i )
         {
             SCH_REFERENCE compRef = m_componentRefs[ i ];
             bool matchFound = false;
@@ -328,7 +328,7 @@ public:
 
     void ApplyData( SCH_EDIT_FRAME* aParent )
     {
-        for( int i = 0; i < m_componentRefs.GetCount(); ++i )
+        for( unsigned i = 0; i < m_componentRefs.GetCount(); ++i )
         {
             SCH_COMPONENT* comp = m_componentRefs[ i ].GetComp();
 
@@ -464,7 +464,7 @@ void DIALOG_FIELDS_EDITOR_GLOBAL::LoadFieldNames()
 {
     std::set<wxString> userFieldNames;
 
-    for( int i = 0; i < m_componentRefs.GetCount(); ++i )
+    for( unsigned i = 0; i < m_componentRefs.GetCount(); ++i )
     {
         SCH_COMPONENT* comp = m_componentRefs[ i ].GetComp();
 
diff --git a/pcbnew/footprint_info_impl.cpp b/pcbnew/footprint_info_impl.cpp
index 6b39a8915a..b263275e59 100644
--- a/pcbnew/footprint_info_impl.cpp
+++ b/pcbnew/footprint_info_impl.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2011 Jean-Pierre Charras, <jp.charras@wanadoo.fr>
  * Copyright (C) 2013-2016 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
- * Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -135,7 +135,7 @@ bool FOOTPRINT_LIST_IMPL::ReadFootprintFiles( FP_LIB_TABLE* aTable, const wxStri
         m_progress_reporter->Report( _( "Fetching Footprint Libraries" ) );
     }
 
-    while( !m_cancelled && m_count_finished.load() < m_loader->m_total_libs )
+    while( !m_cancelled && (int)m_count_finished.load() < m_loader->m_total_libs )
     {
         if( m_progress_reporter )
             m_cancelled = !m_progress_reporter->KeepRefreshing();
@@ -272,7 +272,7 @@ bool FOOTPRINT_LIST_IMPL::JoinWorkers()
         } ) );
     }
 
-    while( !m_cancelled && m_count_finished.load() < total_count )
+    while( !m_cancelled && (size_t)m_count_finished.load() < total_count )
     {
         if( m_progress_reporter )
             m_cancelled = !m_progress_reporter->KeepRefreshing();