diff --git a/vstgui/lib/platform/win32/win32taskexecutor.cpp b/vstgui/lib/platform/win32/win32taskexecutor.cpp
index 1a3268381..4076b3c69 100644
--- a/vstgui/lib/platform/win32/win32taskexecutor.cpp
+++ b/vstgui/lib/platform/win32/win32taskexecutor.cpp
@@ -243,6 +243,7 @@ Tasks::Queue Win32TaskExecutor::makeSerialQueue (const char* name) const
 	impl->serialQueueLock.lock ();
 	auto serialQueue = std::make_shared<Detail::SerialQueue> (name, impl->nextSerialQueueID++);
 	impl->serialQueues.emplace_back (serialQueue);
+	impl->serialQueueLock.unlock ();
 	return serialQueue->queueID;
 }
 
diff --git a/vstgui/tests/unittest/CMakeLists.txt b/vstgui/tests/unittest/CMakeLists.txt
index b3464fb40..3aed48273 100644
--- a/vstgui/tests/unittest/CMakeLists.txt
+++ b/vstgui/tests/unittest/CMakeLists.txt
@@ -188,6 +188,9 @@ else()
 		target_include_directories(${target} PRIVATE ${FREETYPE_INCLUDE_DIRS})
 	endif()
 
+    if(WIN32)
+        target_compile_options(${target} PRIVATE /bigobj)
+    endif()
 endif(VSTGUI_USE_XCODE_XCTEST)
 
 if(CMAKE_HOST_APPLE)