diff --git a/3rdparty/minitrace/minitrace.cpp b/3rdparty/minitrace/minitrace.cpp
index 6abf4e6d0..a3ac5f829 100644
--- a/3rdparty/minitrace/minitrace.cpp
+++ b/3rdparty/minitrace/minitrace.cpp
@@ -12,7 +12,9 @@
 
 #ifdef _WIN32
 #pragma warning (disable:4996)
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #define __thread __declspec(thread)
 #define pthread_mutex_t CRITICAL_SECTION
diff --git a/include/behaviortree_cpp/blackboard.h b/include/behaviortree_cpp/blackboard.h
index 934f3fb7b..d1b2fc509 100644
--- a/include/behaviortree_cpp/blackboard.h
+++ b/include/behaviortree_cpp/blackboard.h
@@ -143,7 +143,7 @@ class Blackboard
       // this is not the first time we set this entry, we need to check
       // if the type is the same or not.
       Entry& entry = *it->second;
-      std::scoped_lock lock(entry.entry_mutex);
+      std::scoped_lock scoped_lock(entry.entry_mutex);
 
       Any& previous_any = entry.value;