diff --git a/Doc/changelog.docu b/Doc/changelog.docu
index e0e41bce..31d2108f 100644
--- a/Doc/changelog.docu
+++ b/Doc/changelog.docu
@@ -18,6 +18,11 @@
 <li>PolyMesh: Copy per-halfedge and per-face properties to new elments during triangulation (Thanks to Max Limper for the patch)</li>
 </ul>
 
+<b>Build System</b>
+<ul>
+<li>Some fixes for min gw (Thanks to Xan for the patch)</li>
+</ul>
+
 </tr>
 
 
diff --git a/cmake/ACGCommon.cmake b/cmake/ACGCommon.cmake
index c5e46f1b..3eb69f5b 100644
--- a/cmake/ACGCommon.cmake
+++ b/cmake/ACGCommon.cmake
@@ -66,7 +66,7 @@ endmacro ()
 
 
 # set directory structures for the different platforms
-if (WIN32)
+if (CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
   set (ACG_PROJECT_DATADIR ".")
   set (ACG_PROJECT_LIBDIR "lib")
   set (ACG_PROJECT_BINDIR ".")
diff --git a/cmake/ACGCompiler.cmake b/cmake/ACGCompiler.cmake
index 92794b50..328157fe 100644
--- a/cmake/ACGCompiler.cmake
+++ b/cmake/ACGCompiler.cmake
@@ -15,7 +15,7 @@ if ( WIN32 )
   set( ADDITIONAL_CMAKE_MODULE_LINKER_FLAGS )
   
   if ( WINDOWS_LARGE_MEMORY_SUPPORT )
-    if( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles")
+    if (MSVC)
 	list(APPEND ADDITIONAL_CMAKE_EXE_LINKER_FLAGS       "/LARGEADDRESSAWARE" )
 	list(APPEND ADDITIONAL_CMAKE_SHARED_LINKER_FLAGS    "/LARGEADDRESSAWARE" )
 	list(APPEND ADDITIONAL_CMAKE_MODULE_LINKER_FLAGS    "/LARGEADDRESSAWARE" )
diff --git a/src/OpenMesh/Core/System/OpenMeshDLLMacros.hh b/src/OpenMesh/Core/System/OpenMeshDLLMacros.hh
index 18c129fe..c4d6a292 100644
--- a/src/OpenMesh/Core/System/OpenMeshDLLMacros.hh
+++ b/src/OpenMesh/Core/System/OpenMeshDLLMacros.hh
@@ -47,7 +47,7 @@
 \*===========================================================================*/
 
 // Disable the warnings about needs to have DLL interface as we have tons of vector templates
-#ifdef WIN32
+#ifdef _MSC_VER
   #pragma warning( disable: 4251 )
 #endif