diff --git a/contrib/src/opendht/package.json b/contrib/src/opendht/package.json
index 65c9c6f5d275924f8449450ba1487a17e4c6f028..2f00dd80c633cd75440df7905570397148ab1d28 100644
--- a/contrib/src/opendht/package.json
+++ b/contrib/src/opendht/package.json
@@ -1,7 +1,7 @@
 {
     "name": "opendht",
-    "version": "fb9e6eee48e652233648b5f09be557859df3c32f",
-    "url": "https://github.com/savoirfairelinux/opendht/archive/__VERSION__.tar.gz",
+    "version": "2.6.0",
+    "url": "https://github.com/savoirfairelinux/opendht/archive/v__VERSION__.tar.gz",
     "deps": [
         "argon2",
         "asio",
diff --git a/src/manager.cpp b/src/manager.cpp
index 9b4dad93b6968e3de551e8d97bf53320cad460b3..5ab0aba4943b104b8b5fa87b7a82ef0c07bd1a24 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -735,8 +735,12 @@ Manager::Manager()
 #endif
     , callFactory(rand_)
     , accountFactory()
-    , pimpl_(new ManagerPimpl(*this))
-{}
+{
+#if defined _MSC_VER
+    gnutls_global_init();
+#endif
+    pimpl_ = std::make_unique<ManagerPimpl>(*this);
+}
 
 Manager::~Manager() {}
 
@@ -759,10 +763,6 @@ Manager::init(const std::string& config_file, libjami::InitFlag flags)
         JAMI_ERR("Unable to initialize git transport %s", error ? error->message : "(unknown)");
     }
 
-#if defined _MSC_VER
-    gnutls_global_init();
-#endif
-
 #ifndef WIN32
     // Set the max number of open files.
     struct rlimit nofiles;
diff --git a/src/plugin/jamipluginmanager.cpp b/src/plugin/jamipluginmanager.cpp
index 977bd4d9704843935ed2e5d06e33dbaf8b8c172b..97b710f6acf42af46a3c21091a452cee963c5bc3 100644
--- a/src/plugin/jamipluginmanager.cpp
+++ b/src/plugin/jamipluginmanager.cpp
@@ -55,6 +55,15 @@
 
 namespace jami {
 
+JamiPluginManager::JamiPluginManager()
+    : callsm_ {pm_}
+    , chatsm_ {pm_}
+    , webviewsm_ {pm_}
+    , preferencesm_ {pm_}
+{
+    registerServices();
+}
+
 std::string
 JamiPluginManager::getPluginAuthor(const std::string& rootPath, const std::string& pluginId)
 {
diff --git a/src/plugin/jamipluginmanager.h b/src/plugin/jamipluginmanager.h
index 2b1365d719d0ccd1ab842951d6468ccc9eb76160..9811380c48e6c5365e9d7a17bc39ecd30daf7a86 100644
--- a/src/plugin/jamipluginmanager.h
+++ b/src/plugin/jamipluginmanager.h
@@ -46,14 +46,7 @@ using PreferencesMap = std::map<std::string, std::map<std::string, std::string>>
 class JamiPluginManager
 {
 public:
-    JamiPluginManager()
-        : callsm_ {pm_}
-        , chatsm_ {pm_}
-        , webviewsm_ {pm_}
-        , preferencesm_ {pm_}
-    {
-        registerServices();
-    }
+    JamiPluginManager();
 
     /**
      * @brief get the plugin's author