diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp
index aa43f1f321c083fd0c44724a658ebdf3ef3e9d8a..ae5889974b3ae3d7e6990a9760e4b9dd38005b2b 100644
--- a/src/jamidht/jamiaccount.cpp
+++ b/src/jamidht/jamiaccount.cpp
@@ -1461,7 +1461,7 @@ JamiAccount::handlePendingCall(PendingCall& pc, bool incoming)
     call->setState(Call::ConnectionState::PROGRESSING);
 
     return true;
-    }
+}
 
 void
 JamiAccount::mapPortUPnP()
diff --git a/src/jamidht/p2p.cpp b/src/jamidht/p2p.cpp
index 6910b51265a7ef997194e021fb19426c4630e381..c87f3a0b5de1b9e292071cedd0e44412c7095d5a 100644
--- a/src/jamidht/p2p.cpp
+++ b/src/jamidht/p2p.cpp
@@ -48,7 +48,7 @@ namespace jami {
 
 static constexpr std::chrono::seconds DHT_MSG_TIMEOUT{30};
 static constexpr std::chrono::seconds NET_CONNECTION_TIMEOUT{10};
-static constexpr std::chrono::seconds SOCK_TIMEOUT{3};
+static constexpr std::chrono::seconds SOCK_TIMEOUT{10};
 static constexpr std::chrono::seconds ICE_READY_TIMEOUT{10};
 static constexpr std::chrono::seconds ICE_INIT_TIMEOUT{10};
 static constexpr std::chrono::seconds ICE_NEGOTIATION_TIMEOUT{10};
@@ -876,7 +876,7 @@ DhtPeerConnector::Impl::answerToRequest(PeerConnectionMsg&& request,
           tls_ep->waitForReady(SOCK_TIMEOUT);
         } catch (const std::exception &e) {
           // In case of a timeout
-          JAMI_WARN() << "TLS connection timeout " << e.what();
+          JAMI_WARN() << "TLS connection timeout: " << e.what();
           return;
         }
 
diff --git a/src/security/tls_session.cpp b/src/security/tls_session.cpp
index e0a6c7ce27011a53c6854e07661f81858311f413..9279ab06e5be7a203ea55849c196a7b8c5232658 100644
--- a/src/security/tls_session.cpp
+++ b/src/security/tls_session.cpp
@@ -1359,20 +1359,20 @@ TlsSession::read(ValueType* data, std::size_t size, std::error_code& ec)
 }
 
 void
-TlsSession::waitForReady(const std::chrono::steady_clock::duration& timeout)
+TlsSession::waitForReady(const duration& timeout)
 {
     auto ready = [this]() ->  bool {
         auto state = pimpl_->state_.load();
         return state == TlsSessionState::ESTABLISHED or state == TlsSessionState::SHUTDOWN;
     };
     std::unique_lock<std::mutex> lk(pimpl_->stateMutex_);
-    if (timeout == std::chrono::steady_clock::duration::zero())
+    if (timeout == duration::zero())
         pimpl_->stateCondition_.wait(lk, ready);
     else
         pimpl_->stateCondition_.wait_for(lk, timeout, ready);
 
     if(!ready())
-        throw std::logic_error("Invalid state in TlsSession::waitForReady");
+        throw std::logic_error("Invalid state in TlsSession::waitForReady: " + std::to_string((int)pimpl_->state_.load()));
 }
 
 int
diff --git a/src/security/tls_session.h b/src/security/tls_session.h
index 80e241e9539bd0fcda2fa58d188f5f46914bc0ba..e61e1491156c24a2093b9cd4b6eaab50e8cc7a01 100644
--- a/src/security/tls_session.h
+++ b/src/security/tls_session.h
@@ -55,6 +55,9 @@ enum class TlsSessionState
     SHUTDOWN
 };
 
+using clock = std::chrono::steady_clock;
+using duration = clock::duration;
+
 struct TlsParams
 {
     // User CA list for session credentials
@@ -70,7 +73,7 @@ struct TlsParams
     std::shared_future<DhParams> dh_params;
 
     // DTLS timeout
-    std::chrono::steady_clock::duration timeout;
+    duration timeout;
 
     // Callback for certificate checkings
     std::function<int(unsigned status,
@@ -130,7 +133,7 @@ public:
 
     int maxPayload() const override;
 
-    void waitForReady(const std::chrono::steady_clock::duration& timeout = {});
+    void waitForReady(const duration& timeout = {});
 
     /// Synchronous writing.
     /// Return a positive number for number of bytes write, or 0 and \a ec set in case of error.
diff --git a/src/sip/sipaccount.cpp b/src/sip/sipaccount.cpp
index 860e159f9d0350879be643c85a9ee0f530fb7562..755fa426b10fca5e306e7c7f47374b145dab89d2 100644
--- a/src/sip/sipaccount.cpp
+++ b/src/sip/sipaccount.cpp
@@ -983,7 +983,7 @@ SIPAccount::sendRegister()
     pjsip_hdr hdr_list;
     pj_list_init(&hdr_list);
     std::string useragent(getUserAgentName());
-    pj_str_t pJuseragent {(char*) useragent.data(), (pj_ssize_t) useragent.size()};
+    auto pJuseragent = CONST_PJ_STR(useragent);
     constexpr pj_str_t STR_USER_AGENT = CONST_PJ_STR("User-Agent");
 
     pjsip_generic_string_hdr *h = pjsip_generic_string_hdr_create(link_->getPool(), &STR_USER_AGENT, &pJuseragent);