diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30f5467ef8e62cd108c20d5ff256d9b5212aaeb7..4ff789b1186adf0bbe192086c2a4ea14f1d8ec99 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,13 +12,6 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs)
 find_package(Threads)
 
-if(MINGW)
-  if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set("${CMAKE_C_FLAGS} -Wa,-mbig-obj" CMAKE_C_FLAGS)
-    set("${CMAKE_CXX_FLAGS} -Wa,-mbig-obj" CMAKE_CXX_FLAGS)
-  endif()
-endif()
-
 # Our subdirectories
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/rew/decoder)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/rew/encoder)
diff --git a/src/rew/encoder/CMakeLists.txt b/src/rew/encoder/CMakeLists.txt
index 0094776569becd728870d0a228182cb415f06c8c..2026a13c936d44d06a4b070613268199da079d70 100644
--- a/src/rew/encoder/CMakeLists.txt
+++ b/src/rew/encoder/CMakeLists.txt
@@ -27,7 +27,7 @@ set(ENCODER_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include/encoder PARENT_SCOPE)
 
 # Add install step
 if(BUILD_INSTALL)
-  install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/encoder DESTINATION include/encoder)
+  install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/rew/encoder DESTINATION include/rew/encoder)
 
   if(MSVC)
     install(FILES $<TARGET_PDB_FILE:${PROJECT_NAME}> DESTINATION bin OPTIONAL)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 24edf6c26742792cd9f7034c6139bd2d5311a3d0..6be4efd735f2fa3b89478e032aa05b3fe29895a7 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -16,6 +16,9 @@ foreach(FILENAME ${TESTS})
     if(MSVC)
         set_target_properties(${TEST_PROJ} PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE")
     endif()
+    if(MINGW)
+        set_target_properties(${TEST_PROJ} PROPERTIES COMPILE_FLAGS "-Wa,-mbig-obj")
+    endif()
 
     set_property(TARGET ${TEST_PROJ} PROPERTY FOLDER "rew/tests") 
     add_test(NAME ${TEST_PROJ} COMMAND ${TEST_PROJ})