diff --git a/rtengine/rawimage.cc b/rtengine/rawimage.cc
index 8ec59b957..9bf0588a4 100644
--- a/rtengine/rawimage.cc
+++ b/rtengine/rawimage.cc
@@ -442,7 +442,7 @@ int RawImage::loadRaw (bool loadData, unsigned int imageNum, bool closeFile, Pro
         return 2;
     }
 
-    if(!strcmp(make,"Fujifilm") && raw_height * raw_width * 2 != raw_size) {
+    if(!strcmp(make,"Fujifilm") && raw_height * raw_width * 2u != raw_size) {
         parse_fuji_compressed_header();
 	}
 
diff --git a/rtgui/dirbrowser.cc b/rtgui/dirbrowser.cc
index a8825d310..572e779a6 100644
--- a/rtgui/dirbrowser.cc
+++ b/rtgui/dirbrowser.cc
@@ -21,7 +21,8 @@
 #include <iostream>
 #include <cstring>
 
-#ifdef WIN32
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
 #define _WIN32_WINNT 0x0600
 #include <windows.h>
 #endif