diff --git a/neb/inc/com/centreon/engine/commands/connector.hh b/neb/inc/com/centreon/engine/commands/connector.hh
index dfc609d4a..79cbfd4ab 100644
--- a/neb/inc/com/centreon/engine/commands/connector.hh
+++ b/neb/inc/com/centreon/engine/commands/connector.hh
@@ -90,6 +90,7 @@ class connector : public command, public process_listener {
   bool _is_running;
   std::unordered_map<uint64_t, std::shared_ptr<query_info> > _queries;
   bool _query_quit_ok;
+  bool _version_set;
   bool _query_version_ok;
   mutable std::mutex _lock;
   process _process;
diff --git a/neb/inc/com/centreon/engine/logging/broker.hh b/neb/inc/com/centreon/engine/logging/broker.hh
index d4549b62e..ad953329f 100644
--- a/neb/inc/com/centreon/engine/logging/broker.hh
+++ b/neb/inc/com/centreon/engine/logging/broker.hh
@@ -34,7 +34,7 @@ namespace logging {
  */
 class broker : public com::centreon::logging::backend {
   bool _enable;
-  std::thread::id _thread;
+  std::thread::id _thread_id;
 
  public:
   broker();
diff --git a/neb/inc/com/centreon/engine/version.hh b/neb/inc/com/centreon/engine/version.hh
index 06986ef83..4a5622684 100644
--- a/neb/inc/com/centreon/engine/version.hh
+++ b/neb/inc/com/centreon/engine/version.hh
@@ -22,8 +22,8 @@
 
 // Compile-time values.
 #define CENTREON_ENGINE_VERSION_MAJOR 21
-#define CENTREON_ENGINE_VERSION_MINOR 04
-#define CENTREON_ENGINE_VERSION_PATCH 3
-#define CENTREON_ENGINE_VERSION_STRING "21.04.3"
+#define CENTREON_ENGINE_VERSION_MINOR 10
+#define CENTREON_ENGINE_VERSION_PATCH 0
+#define CENTREON_ENGINE_VERSION_STRING "21.10.0"
 
 #endif  // !CCE_VERSION_HH
diff --git a/neb/inc/com/centreon/logging/backend.hh b/neb/inc/com/centreon/logging/backend.hh
index 52feca8a1..6da9ee6fb 100644
--- a/neb/inc/com/centreon/logging/backend.hh
+++ b/neb/inc/com/centreon/logging/backend.hh
@@ -73,7 +73,7 @@ class backend {
   void _build_header(misc::stringifier& buffer);
 
   bool _is_sync;
-  mutable std::mutex _lock;
+  mutable std::recursive_mutex _lock;
   bool _show_pid;
   time_precision _show_timestamp;
   bool _show_thread_id;