diff --git a/daemon/src/client/callmanager.cpp b/daemon/src/client/callmanager.cpp
index 7703159850d1dd2512491040296662f826a8b7ae..90ace8c81de039334dbf4bae482f30f4de39c37d 100644
--- a/daemon/src/client/callmanager.cpp
+++ b/daemon/src/client/callmanager.cpp
@@ -292,7 +292,7 @@ startTone(int32_t start, int32_t type)
 bool
 switchInput(const std::string& callID, const std::string& resource)
 {
-    ring::Manager::instance().switchInput(callID, resource);
+    return ring::Manager::instance().switchInput(callID, resource);
 }
 
 void
diff --git a/daemon/src/ice_transport.cpp b/daemon/src/ice_transport.cpp
index 85d5a6c47dd5cf8fffa90e658d24af766cba2583..afa7e6a6dfda87c754a90d533640e623add0407d 100644
--- a/daemon/src/ice_transport.cpp
+++ b/daemon/src/ice_transport.cpp
@@ -242,7 +242,7 @@ IceTransport::setSlaveSession()
         }
         return true;
     }
-    createIceSession(PJ_ICE_SESS_ROLE_CONTROLLED);
+    return createIceSession(PJ_ICE_SESS_ROLE_CONTROLLED);
 }
 
 bool
@@ -441,9 +441,10 @@ IceTransport::getLocalCandidatesAddr(unsigned comp_id) const
         return cand_addrs;
     }
 
-    for (unsigned i=0; i<cand_cnt; ++i) {
+    for (unsigned i=0; i<cand_cnt; ++i)
         cand_addrs.push_back(cand[i].addr);
-    }
+
+    return cand_addrs;
 }
 
 void
diff --git a/daemon/src/managerimpl.cpp b/daemon/src/managerimpl.cpp
index de963720efbfff2d0f711cf443e436b43fa87492..1c11127a0a6385421bee92b9ad67abc977e897e5 100644
--- a/daemon/src/managerimpl.cpp
+++ b/daemon/src/managerimpl.cpp
@@ -2090,15 +2090,16 @@ ManagerImpl::getCurrentAudioDevicesIndex()
     return v;
 }
 
-void
+bool
 ManagerImpl::switchInput(const std::string& call_id, const std::string& res)
 {
     auto call = getCallFromCallID(call_id);
     if (!call) {
         RING_ERR("Call %s is NULL", call_id.c_str());
-        return;
+        return false;
     }
     call->switchInput(res);
+    return true;
 }
 
 int
diff --git a/daemon/src/managerimpl.h b/daemon/src/managerimpl.h
index 42d2b150c579e923ae856b4a7987f6c517cf98dd..3bc52086649c302b32a6c2416e19c9e44b7cc7a6 100644
--- a/daemon/src/managerimpl.h
+++ b/daemon/src/managerimpl.h
@@ -559,7 +559,7 @@ class ManagerImpl {
         bool isAGCEnabled() const;
         void setAGCState(bool enabled);
 
-        void switchInput(const std::string& callid, const std::string& res);
+        bool switchInput(const std::string& callid, const std::string& res);
 
         /**
          * Ringtone option.
diff --git a/daemon/src/ringdht/sips_transport_ice.cpp b/daemon/src/ringdht/sips_transport_ice.cpp
index deaf6b17549239613fd598a79d7c256047d7d3e5..a3210a72fb99d94b9b34fd38f0bae09a64c3ebd5 100644
--- a/daemon/src/ringdht/sips_transport_ice.cpp
+++ b/daemon/src/ringdht/sips_transport_ice.cpp
@@ -320,6 +320,8 @@ SipsIceTransport::startTlsSession()
     // start handshake
     handshakeStart_ = clock::now();
     state_ = TlsConnectionState::HANDSHAKING;
+
+    return PJ_SUCCESS;
 }
 
 void
@@ -646,9 +648,9 @@ SipsIceTransport::setup()
     if (is_server_) {
         gnutls_key_generate(&cookie_key_, GNUTLS_COOKIE_KEY_SIZE);
         state_ = TlsConnectionState::COOKIE;
-    } else
-        startTlsSession();
-    return true;
+        return true;
+    }
+    return startTlsSession();
 }
 
 void
diff --git a/daemon/src/upnp/upnp_control.cpp b/daemon/src/upnp/upnp_control.cpp
index 7e7e5f34d772d8b093ca6a12280873d85661bee6..c30dbaefab68dc8cf9513abfabbdd87a3e1ab43d 100644
--- a/daemon/src/upnp/upnp_control.cpp
+++ b/daemon/src/upnp/upnp_control.cpp
@@ -100,7 +100,8 @@ Controller::addAnyMapping(uint16_t port_desired,
                           bool unique,
                           uint16_t *port_used)
 {
-    addAnyMapping(port_desired, port_desired, type, true, unique, port_used);
+    return addAnyMapping(port_desired, port_desired, type, true, unique,
+                         port_used);
 }
 
 void