diff --git a/src/iax/iaxcall.h b/src/iax/iaxcall.h
index 85affd96e13a0ba564665e03769ffad81c9743df..99f69d1f6c8a5e63fdc0d8f85d507a53f2184544 100644
--- a/src/iax/iaxcall.h
+++ b/src/iax/iaxcall.h
@@ -136,7 +136,7 @@ class IAXCall : public Call
         bool offhold();
 
         //TODO: implement mute for IAX
-        void muteMedia(const std::string& mediaType, bool isMuted) {}
+        void muteMedia(const std::string& /*mediaType*/, bool /*isMuted*/) {}
 
         //TODO: implement restartMedia for IAX
         void restartMediaSender() override {}
diff --git a/src/manager.cpp b/src/manager.cpp
index 93579169ee7e11db31db9f5ee14b38812a8f55aa..7f75ae71d2aacf6b0783168a5a09252abdf885fc 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -618,7 +618,8 @@ Manager::onHoldCall(const std::string& callId)
 
     if (auto call = getCallFromCallID(callId)) {
         try {
-            if (result = call->onhold())
+            result = call->onhold();
+            if (result)
                 removeAudio(*call); // Unbind calls in main buffer
         } catch (const VoipLinkException &e) {
             RING_ERR("%s", e.what());
diff --git a/src/ringdht/ringaccount.cpp b/src/ringdht/ringaccount.cpp
index cc7a0930926f102ff3ed2777b3a60759d91f365a..fbcf3bd909e8ea4ddde266b4020d6526cd51d66a 100644
--- a/src/ringdht/ringaccount.cpp
+++ b/src/ringdht/ringaccount.cpp
@@ -199,17 +199,17 @@ RingAccount::newOutgoingCall(const std::string& toUrl)
         auto call = weak_call.lock();
 
         if (not call)
-            return false;
+            return;
 
         /* First step: wait for an initialized ICE transport for SIP channel */
         if (ice->isFailed() or std::chrono::steady_clock::now() >= iceInitTimeout) {
             RING_DBG("ice init failed (or timeout)");
             call->onFailure();
-            return false;
+            return;
         }
 
         if (not ice->isInitialized())
-            return true;
+            return;
 
         /* Next step: sent the ICE data to peer through DHT */
         const dht::Value::Id callvid  = udist(shared_this->rand_);
diff --git a/src/sip/sipaccount.cpp b/src/sip/sipaccount.cpp
index 83f7791e20bc77da1b99b4f1038fd5482b24196b..3e55e9d18943c77edc7e72b3bc5c9e618757b3e5 100644
--- a/src/sip/sipaccount.cpp
+++ b/src/sip/sipaccount.cpp
@@ -1425,7 +1425,7 @@ SIPAccount::getContactHeader(pjsip_transport* t)
         t = transport_->get();
     if (!t) {
         RING_ERR("Transport not created yet");
-        return {};
+        return {nullptr, 0};
     }
 
     // The transport type must be specified, in our case START_OTHER refers to stun transport
@@ -1655,7 +1655,8 @@ SIPAccount::getCredentials() const
 }
 
 void
-SIPAccount::setRegistrationState(RegistrationState state, unsigned details_code, const std::string& detail_str)
+SIPAccount::setRegistrationState(RegistrationState state, unsigned details_code,
+                                 const std::string& /*detail_str*/)
 {
     std::string details_str;
     const pj_str_t *description = pjsip_get_status_text(details_code);