diff --git a/asam_cmp_capture_module/src/capture_fb.cpp b/asam_cmp_capture_module/src/capture_fb.cpp
index ce7c679..036a6bf 100644
--- a/asam_cmp_capture_module/src/capture_fb.cpp
+++ b/asam_cmp_capture_module/src/capture_fb.cpp
@@ -139,7 +139,7 @@ void CaptureFb::startStatusLoop()
 void CaptureFb::stopStatusLoop()
 {
     {
-        std::scoped_lock<std::mutex> lock(sync);
+        auto lock2 = getRecursiveConfigLock();
         stopStatusSending = true;
     }
     cv.notify_one();
diff --git a/asam_cmp_capture_module/tests/ref_can_channel_impl.cpp b/asam_cmp_capture_module/tests/ref_can_channel_impl.cpp
index 928b3f6..a0706ba 100644
--- a/asam_cmp_capture_module/tests/ref_can_channel_impl.cpp
+++ b/asam_cmp_capture_module/tests/ref_can_channel_impl.cpp
@@ -14,6 +14,8 @@
 #include <opendaq/signal_factory.h>
 #include "include/ref_can_channel_impl.h"
 
+#include <chrono>
+
 #define PI 3.141592653589793
 
 namespace daq {
diff --git a/asam_cmp_capture_module/tests/ref_channel_impl.cpp b/asam_cmp_capture_module/tests/ref_channel_impl.cpp
index 62ce22e..0c8648e 100644
--- a/asam_cmp_capture_module/tests/ref_channel_impl.cpp
+++ b/asam_cmp_capture_module/tests/ref_channel_impl.cpp
@@ -16,6 +16,8 @@
 #include <asam_cmp_capture_module/dispatch.h>
 #include <opendaq/sample_type_traits.h>
 
+#include <chrono>
+
 namespace daq
 {
 
diff --git a/asam_cmp_common_lib/src/CMakeLists.txt b/asam_cmp_common_lib/src/CMakeLists.txt
index 0da71ce..fddd28b 100644
--- a/asam_cmp_common_lib/src/CMakeLists.txt
+++ b/asam_cmp_common_lib/src/CMakeLists.txt
@@ -35,6 +35,10 @@ if(UNIX)
     target_compile_options(${PROJECT_NAME} PRIVATE -fPIC)
 endif()
 
+if (MSVC)
+    target_compile_options(${PROJECT_NAME} PRIVATE /bigobj)
+endif()
+
 target_link_libraries(${PROJECT_NAME} PUBLIC daq::opendaq
                                           Pcap++
                                           asam_cmp
diff --git a/asam_cmp_data_sink/src/stream_fb.cpp b/asam_cmp_data_sink/src/stream_fb.cpp
index d46fbcd..d2b188c 100644
--- a/asam_cmp_data_sink/src/stream_fb.cpp
+++ b/asam_cmp_data_sink/src/stream_fb.cpp
@@ -3,6 +3,10 @@
 #include <asam_cmp_common_lib/unit_converter.h>
 #include <asam_cmp_data_sink/stream_fb.h>
 
+
+#include <chrono>
+
+
 BEGIN_NAMESPACE_ASAM_CMP_DATA_SINK_MODULE
 
 StreamFb::StreamFb(const ContextPtr& ctx,
diff --git a/asam_cmp_data_sink/tests/test_stream_fb.cpp b/asam_cmp_data_sink/tests/test_stream_fb.cpp
index b7db86f..101a766 100644
--- a/asam_cmp_data_sink/tests/test_stream_fb.cpp
+++ b/asam_cmp_data_sink/tests/test_stream_fb.cpp
@@ -15,8 +15,9 @@
 #include <opendaq/scheduler_factory.h>
 #include <opendaq/search_filter_factory.h>
 #include <thread>
+#include <chrono>
 
-using namespace std::chrono_literals;
+using namespace std::literals;
 
 using namespace daq;
 using ASAM::CMP::AnalogPayload;
diff --git a/external/openDAQ/CMakeLists.txt b/external/openDAQ/CMakeLists.txt
index 9632d44..ee754f1 100644
--- a/external/openDAQ/CMakeLists.txt
+++ b/external/openDAQ/CMakeLists.txt
@@ -3,7 +3,7 @@ set(OPENDAQ_ENABLE_TESTS false)
 FetchContent_Declare(
     openDAQ
     GIT_REPOSITORY https://github.com/openDAQ/openDAQ.git
-    GIT_TAG        4ad72a2c8e0cece80a9898dd844dff3f53f43f2f
+    GIT_TAG        14b647f955078e7d146513cfb2edc24a675fe679
     GIT_PROGRESS   ON
     SYSTEM
     FIND_PACKAGE_ARGS 3.0.0 GLOBAL