diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3f5d890..1299b28f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,7 +91,7 @@ if(MSVC)
     include_directories(${glm_INCLUDE_DIR})
     add_definitions("/bigobj")
 	set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-    SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} " /w /wd4710 /wd4711 /wd4668 /wd5045 /wd9002 /wd4365 /wd4242 /wd9002 /wd9014 /wd9025")
+    SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} " /w /wd4710 /wd4711 /wd4668 /wd5045 /wd9002 /wd4365 /wd4242")
     SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} " /w /wd4710 /wd4711")
     # Kaguya uses a pointer to a local variable (in object.hpp file) to store class conversions.
 	# When used in different modules, the variable doesn't have the same address, preventing to mix kernel and UI bindings
diff --git a/lckernel/CMakeLists.txt b/lckernel/CMakeLists.txt
index ba5ebdcf..fd108537 100644
--- a/lckernel/CMakeLists.txt
+++ b/lckernel/CMakeLists.txt
@@ -234,7 +234,7 @@ cad/objects/pattern.h
 )
 
 # Boost logging
-find_package(Boost REQUIRED COMPONENTS log)
+find_package(Boost REQUIRED)
 include_directories(${Boost_INCLUDE_DIRS})
 link_directories(${Boost_LIBRARY_DIRS})
 
@@ -279,7 +279,7 @@ add_library(lckernel SHARED ${lckernel_srcs} ${lckernel_hdrs})
 target_link_libraries(lckernel ${Boost_LIBRARIES} ${APR_LIBRARIES} ${G_EXTRA_LIBS} tinysplinecxx)
 
 if (MSVC)
-    target_link_libraries(lckernel Boost::log)
+    target_link_libraries(lckernel Boost::log Boost::log_setup)
 endif()
 
 # INSTALLATION