diff --git a/Host/BootCommander.exe b/Host/BootCommander.exe
index 9b0e9b2d..28337a6c 100644
Binary files a/Host/BootCommander.exe and b/Host/BootCommander.exe differ
diff --git a/Host/Source/BootCommander/CMakeLists.txt b/Host/Source/BootCommander/CMakeLists.txt
index e4795205..678e7183 100644
--- a/Host/Source/BootCommander/CMakeLists.txt
+++ b/Host/Source/BootCommander/CMakeLists.txt
@@ -75,7 +75,11 @@ set(LIBOPENBLT_LIB ${PROJECT_OUTPUT_DIRECTORY})
 #****************************************************************************************
 # Set platform specific compiler macro PLATFORM_XXX
 if(WIN32)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WIN32 -D_CRT_SECURE_NO_WARNINGS")
+  if(CMAKE_C_COMPILER_ID MATCHES GNU)  
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WIN32 -D_CRT_SECURE_NO_WARNINGS -std=gnu99")
+  elseif(CMAKE_C_COMPILER_ID MATCHES MSVC)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WIN32 -D_CRT_SECURE_NO_WARNINGS")
+  endif()
 elseif(UNIX)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_LINUX -pthread -std=gnu99")
 endif(WIN32)
diff --git a/Host/Source/LibOpenBLT/CMakeLists.txt b/Host/Source/LibOpenBLT/CMakeLists.txt
index 5e8e51d5..694ea62c 100644
--- a/Host/Source/LibOpenBLT/CMakeLists.txt
+++ b/Host/Source/LibOpenBLT/CMakeLists.txt
@@ -63,10 +63,8 @@ option(LINT_ENABLED "Configurable to enable/disable the PC-lint target" OFF)
 # Set the port directory, which is platform specific
 if(WIN32)
   set(PROJECT_PORT_DIR ${PROJECT_SOURCE_DIR}/port/windows)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WIN32 -D_CRT_SECURE_NO_WARNINGS")
 elseif(UNIX)
   set(PROJECT_PORT_DIR ${PROJECT_SOURCE_DIR}/port/linux)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_LINUX -pthread -std=gnu99")
 endif(WIN32)
 
 # Set the output directory
@@ -84,6 +82,20 @@ foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
     set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${PROJECT_OUTPUT_DIRECTORY} )
 endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
 
+#****************************************************************************************
+# Compiler flags
+#****************************************************************************************
+# Set platform specific compiler macro PLATFORM_XXX
+if(WIN32)
+  if(CMAKE_C_COMPILER_ID MATCHES GNU)  
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WIN32 -D_CRT_SECURE_NO_WARNINGS -std=gnu99")
+  elseif(CMAKE_C_COMPILER_ID MATCHES MSVC)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WIN32 -D_CRT_SECURE_NO_WARNINGS")
+  endif()
+elseif(UNIX)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_LINUX -pthread -std=gnu99")
+endif(WIN32)
+
 
 #***************************************************************************************
 # Includes
diff --git a/Host/Source/LibOpenBLT/port/windows/canif/lawicel/canusb.c b/Host/Source/LibOpenBLT/port/windows/canif/lawicel/canusb.c
index bc0c5a19..4004230e 100644
--- a/Host/Source/LibOpenBLT/port/windows/canif/lawicel/canusb.c
+++ b/Host/Source/LibOpenBLT/port/windows/canif/lawicel/canusb.c
@@ -245,7 +245,7 @@ static bool CanUsbConnect(void)
     result = true;
     /* Set the reception callback function. */
     if (CanUsbLibFuncSetReceiveCallBack(canUsbCanHandle, 
-                                        CanUsbLibReceiveCallback) <= 0)
+                               (LPFNDLL_RECEIVE_CALLBACK)CanUsbLibReceiveCallback) <= 0)
     {
       result = false;
     }
diff --git a/Host/Source/SeedNKey/CMakeLists.txt b/Host/Source/SeedNKey/CMakeLists.txt
index a37f9db2..fdfb7d64 100644
--- a/Host/Source/SeedNKey/CMakeLists.txt
+++ b/Host/Source/SeedNKey/CMakeLists.txt
@@ -71,9 +71,13 @@ endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
 #****************************************************************************************
 # Set platform specific compiler macro PLATFORM_XXX
 if(WIN32)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WIN32 -D_CRT_SECURE_NO_WARNINGS")
+  if(CMAKE_C_COMPILER_ID MATCHES GNU)  
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WIN32 -D_CRT_SECURE_NO_WARNINGS -std=gnu99")
+  elseif(CMAKE_C_COMPILER_ID MATCHES MSVC)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WIN32 -D_CRT_SECURE_NO_WARNINGS")
+  endif()
 elseif(UNIX)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_LINUX -std=gnu99")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_LINUX -pthread -std=gnu99")
 endif(WIN32)
 
 
diff --git a/Host/libopenblt.dll b/Host/libopenblt.dll
index 5505c3a4..cc67a357 100644
Binary files a/Host/libopenblt.dll and b/Host/libopenblt.dll differ
diff --git a/Host/libseednkey.dll b/Host/libseednkey.dll
index 1f8c1399..df2a4bd8 100644
Binary files a/Host/libseednkey.dll and b/Host/libseednkey.dll differ