diff --git a/src/guiengine/widgets/dynamic_ribbon_widget.hpp b/src/guiengine/widgets/dynamic_ribbon_widget.hpp
index b3cdd1396..a46a28202 100644
--- a/src/guiengine/widgets/dynamic_ribbon_widget.hpp
+++ b/src/guiengine/widgets/dynamic_ribbon_widget.hpp
@@ -187,7 +187,7 @@ namespace GUIEngine
         int m_max_label_width;
 
         /** Max length of a label, in characters */
-        int m_max_label_length;
+        unsigned int m_max_label_length;
 
     public:
 
@@ -298,7 +298,7 @@ namespace GUIEngine
         /** Set approximately how many items are expected to be in this ribbon; will help the layout
           * algorithm next time add() is called */
         void setItemCountHint(int hint) { m_item_count_hint = hint; }
-        
+
         /** Set max length of displayed text. */
         void setMaxLabelLength(int length) { m_max_label_length = length; }
     };
diff --git a/src/network/protocols/connect_to_server.cpp b/src/network/protocols/connect_to_server.cpp
index bc4dda7fd..1f66313fb 100644
--- a/src/network/protocols/connect_to_server.cpp
+++ b/src/network/protocols/connect_to_server.cpp
@@ -218,7 +218,7 @@ void ConnectToServer::asynchronousUpdate()
                         }   // while insufficient buffer
                         for(unsigned int i=0; i<table->dwNumEntries; i++)
                         {
-                            int ip = ntohl(table->table[i].dwAddr);
+                            unsigned int ip = ntohl(table->table[i].dwAddr);
                             if(sender.ip == ip) // this interface is ours
                             {
                                 sender.ip = 0x7f000001; // 127.0.0.1
diff --git a/src/network/protocols/get_public_address.cpp b/src/network/protocols/get_public_address.cpp
index 29885bbbf..03c232323 100644
--- a/src/network/protocols/get_public_address.cpp
+++ b/src/network/protocols/get_public_address.cpp
@@ -30,6 +30,7 @@
 #include <assert.h>
 
 #ifdef __MINGW32__
+#  undef _WIN32_WINNT
 #  define _WIN32_WINNT 0x501
 #endif
 
diff --git a/src/utils/string_utils.cpp b/src/utils/string_utils.cpp
index e560bd2b5..fbbaba2b3 100644
--- a/src/utils/string_utils.cpp
+++ b/src/utils/string_utils.cpp
@@ -310,7 +310,7 @@ namespace StringUtils
             for(int i=(int)dirs.size()-1; i>=0; i--)
             {
                 if(dirs[i].size()>1) continue;
-                if(i==dirs.size()-1)    // last element
+                if(i==(int)dirs.size()-1)    // last element
                 {
                     dirs[i]+=":";      // turn "c" back into "c:"
                 }