diff --git a/Unity/AirLibWrapper/AirsimWrapper/CMakeLists.txt b/Unity/AirLibWrapper/AirsimWrapper/CMakeLists.txt
index 140772d5f7..b636a55770 100644
--- a/Unity/AirLibWrapper/AirsimWrapper/CMakeLists.txt
+++ b/Unity/AirLibWrapper/AirsimWrapper/CMakeLists.txt
@@ -22,12 +22,23 @@ IncludeEigen()
 
 project(AirsimWrapper VERSION 0)
 
+find_package(Boost REQUIRED COMPONENTS filesystem)
+if(Boost_FOUND)
+    MESSAGE("Boost information:") 
+    MESSAGE("  Boost_INCLUDE_DIRS: ${Boost_INCLUDE_DIRS}") 
+    MESSAGE("  Boost_LIBRARIES: ${Boost_LIBRARIES}") 
+    MESSAGE("  Boost_LIBRARY_DIRS: ${Boost_LIBRARY_DIRS}") 
+    MESSAGE("  Boost_FILESYSTEM_LIBRARY: ${boost_filesystem_DIR}")
+endif()
+
+include_directories(${Boost_INCLUDE_DIRS})
+
 # RPC includes & source files
 BuildRpc()
 # MavLink source files
 BuildMavLink()
 #AirLib source files
-BuildAirlib()
+BuildAirLib()
 #AirsimWrapper source files
 BuildAirsimWrapper()
 
@@ -53,7 +64,7 @@ else ()
     )
 endif ()
 
-target_link_libraries(${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}  -lstdc++ -lpthread -lboost_filesystem)
+target_link_libraries(${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}  -lstdc++ -lpthread ${Boost_LIBRARIES})
 
 
 
diff --git a/Unity/AirLibWrapper/AirsimWrapper/cmake/airlib-setup.cmake b/Unity/AirLibWrapper/AirsimWrapper/cmake/airlib-setup.cmake
index d6a11bb963..0ca56b1717 100644
--- a/Unity/AirLibWrapper/AirsimWrapper/cmake/airlib-setup.cmake
+++ b/Unity/AirLibWrapper/AirsimWrapper/cmake/airlib-setup.cmake
@@ -10,8 +10,7 @@ file(GLOB_RECURSE AIRLIB_LIBRARY_SOURCE_FILES
   ${AIRSIM_ROOT}/AirLib/src/api/*.cpp
   ${AIRSIM_ROOT}/AirLib/src/common/common_utils/*.cpp
   ${AIRSIM_ROOT}/AirLib/src/safety/*.cpp
-  ${AIRSIM_ROOT}/AirLib/src/vehicles/car/api/*.cpp
-  ${AIRSIM_ROOT}/AirLib/src/vehicles/multirotor/api/*.cpp
+  ${AIRSIM_ROOT}/AirLib/src/vehicles/car/*.cpp
   ${AIRSIM_ROOT}/AirLib/src/vehicles/multirotor/*.cpp
 )
 
diff --git a/Unity/AirLibWrapper/AirsimWrapper/cmake/rpc-setup.cmake b/Unity/AirLibWrapper/AirsimWrapper/cmake/rpc-setup.cmake
index 82b7daf19f..5a5723be44 100644
--- a/Unity/AirLibWrapper/AirsimWrapper/cmake/rpc-setup.cmake
+++ b/Unity/AirLibWrapper/AirsimWrapper/cmake/rpc-setup.cmake
@@ -275,7 +275,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
     set(UNUSED_LAMBDA_CAPTURE_WARN_SUPPORTED)
     check_warning_flag("unused-lambda-capture" UNUSED_LAMBDA_CAPTURE_WARN_SUPPORTED)
     if(${UNUSED_LAMBDA_CAPTURE_WARN_SUPPORTED})
-      list(APPEND RPCLIB_BUILD_FLAGS -Wno-no-unused-lambda-capture)
+      list(APPEND RPCLIB_BUILD_FLAGS -Wno-unused-lambda-capture)
     endif()
 
     check_warning_flag("zero-as-null-pointer-constant" ZERO_AS_NULL_POINTER_CONSTANT_WARN_SUPPORTED)