diff --git a/src/engine/helper/HL_String.cpp b/src/engine/helper/HL_String.cpp
index 429c6905..bd5296a6 100644
--- a/src/engine/helper/HL_String.cpp
+++ b/src/engine/helper/HL_String.cpp
@@ -430,10 +430,8 @@ std::string strx::removeQuotes(const std::string& s)
 const void *memmem(const void *haystack, size_t haystack_len,
                    const void * const needle, const size_t needle_len)
 {
-    if (haystack == NULL) return NULL; // or assert(haystack != NULL);
-    if (haystack_len == 0) return NULL;
-    if (needle == NULL) return NULL; // or assert(needle != NULL);
-    if (needle_len == 0) return NULL;
+    if (!haystack || !haystack_len || !needle || !needle_len)
+        return nullptr;
 
     for (const char *h = (const char*)haystack;
          haystack_len >= needle_len;
diff --git a/src/libs/libevs/CMakeLists.txt b/src/libs/libevs/CMakeLists.txt
index 513f3346..f9b96a32 100644
--- a/src/libs/libevs/CMakeLists.txt
+++ b/src/libs/libevs/CMakeLists.txt
@@ -14,3 +14,5 @@ target_include_directories(evs_codec PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/basic_o
                                              ${CMAKE_CURRENT_SOURCE_DIR}/lib_enc
                                              ${CMAKE_CURRENT_SOURCE_DIR}/lib_dec
                                              ${CMAKE_CURRENT_SOURCE_DIR}/lib_com)
+
+set_property(TARGET evs_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
diff --git a/src/libs/opus/CMakeLists.txt b/src/libs/opus/CMakeLists.txt
index 66b16d9e..a1956670 100644
--- a/src/libs/opus/CMakeLists.txt
+++ b/src/libs/opus/CMakeLists.txt
@@ -256,6 +256,8 @@ endif()
 add_library(opus ${opus_headers} ${opus_sources} ${opus_sources_float} ${Opus_PUBLIC_HEADER})
 add_library(Opus::opus ALIAS opus)
 
+set_property(TARGET opus PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+
 get_library_version(OPUS_LIBRARY_VERSION OPUS_LIBRARY_VERSION_MAJOR)
 message(DEBUG "Opus library version: ${OPUS_LIBRARY_VERSION}")