diff --git a/src/gst-plugins/commons/sdpagent/kmssdpsctpmediahandler.c b/src/gst-plugins/commons/sdpagent/kmssdpsctpmediahandler.c
index 4392b7f70..cffed195b 100644
--- a/src/gst-plugins/commons/sdpagent/kmssdpsctpmediahandler.c
+++ b/src/gst-plugins/commons/sdpagent/kmssdpsctpmediahandler.c
@@ -407,8 +407,9 @@ kms_sdp_sctp_media_handler_init_offer (KmsSdpMediaHandler * handler,
 
   if (gst_sdp_media_add_attribute (offer, "setup", "actpass") != GST_SDP_OK) {
     g_set_error_literal (error, KMS_SDP_AGENT_ERROR, SDP_AGENT_UNEXPECTED_ERROR,
-        "Can not to set attribute 'setup:actpass'");
+        "Can not set attribute 'setup:actpass'");
     ret = FALSE;
+    goto end;
   }
 
 end:
diff --git a/src/server/implementation/MediaSet.hpp b/src/server/implementation/MediaSet.hpp
index e7f01af84..5cde06468 100644
--- a/src/server/implementation/MediaSet.hpp
+++ b/src/server/implementation/MediaSet.hpp
@@ -107,7 +107,7 @@ class MediaSet
 
   std::recursive_mutex recMutex;
   std::condition_variable_any waitCond;
-  std::atomic<bool> terminated;
+  std::atomic<bool> terminated{};
 
   std::shared_ptr <ServerManagerImpl> serverManager;
 
diff --git a/src/server/implementation/UUIDGenerator.cpp b/src/server/implementation/UUIDGenerator.cpp
index 12eac2817..ebfbce4ef 100644
--- a/src/server/implementation/UUIDGenerator.cpp
+++ b/src/server/implementation/UUIDGenerator.cpp
@@ -30,7 +30,7 @@ class RandomGenerator
 {
   boost::uuids::basic_random_generator<boost::mt19937> gen;
   boost::mt19937 ran;
-  pid_t pid;
+  pid_t pid{};
 
 public:
   RandomGenerator () : gen (&ran)
diff --git a/src/server/implementation/objects/HubPortImpl.hpp b/src/server/implementation/objects/HubPortImpl.hpp
index c5e857b9d..fcd051dc9 100644
--- a/src/server/implementation/objects/HubPortImpl.hpp
+++ b/src/server/implementation/objects/HubPortImpl.hpp
@@ -57,8 +57,7 @@ class HubPortImpl : public MediaElementImpl, public virtual HubPort
   virtual void Serialize (JsonSerializer &serializer) override;
 
 private:
-
-  int handlerId;
+  int handlerId{};
 
   class StaticConstructor
   {
diff --git a/src/server/implementation/objects/MediaObjectImpl.hpp b/src/server/implementation/objects/MediaObjectImpl.hpp
index 75d727d0b..50059a8bf 100644
--- a/src/server/implementation/objects/MediaObjectImpl.hpp
+++ b/src/server/implementation/objects/MediaObjectImpl.hpp
@@ -127,7 +127,7 @@ class MediaObjectImpl : public virtual MediaObject
     } catch (KurentoException &e) {
       GST_WARNING ("Posible error deserializing %s from config", key.c_str() );
     } catch (std::exception &e) {
-      GST_WARNING ("Unknown error getting%s from config", key.c_str() );
+      GST_WARNING ("Unknown error getting '%s' from config", key.c_str() );
     }
 
     return defaultValue;
diff --git a/src/server/implementation/objects/SdpEndpointImpl.hpp b/src/server/implementation/objects/SdpEndpointImpl.hpp
index 5eaff8e44..b47bb3830 100644
--- a/src/server/implementation/objects/SdpEndpointImpl.hpp
+++ b/src/server/implementation/objects/SdpEndpointImpl.hpp
@@ -70,9 +70,9 @@ class SdpEndpointImpl : public SessionEndpointImpl, public virtual SdpEndpoint
 private:
 
   static std::mutex sdpMutex;
-  std::atomic_bool offerInProcess;
-  std::atomic_bool waitingAnswer;
-  std::atomic_bool answerProcessed;
+  std::atomic_bool offerInProcess{};
+  std::atomic_bool waitingAnswer{};
+  std::atomic_bool answerProcessed{};
 
   class StaticConstructor
   {
diff --git a/src/server/implementation/objects/UriEndpointImpl.hpp b/src/server/implementation/objects/UriEndpointImpl.hpp
index e51d48003..08e9fc029 100644
--- a/src/server/implementation/objects/UriEndpointImpl.hpp
+++ b/src/server/implementation/objects/UriEndpointImpl.hpp
@@ -70,7 +70,7 @@ class UriEndpointImpl : public EndpointImpl, public virtual UriEndpoint
 
   std::string uri;
   std::string absolute_uri;
-  gulong stateChangedHandlerId;
+  gulong stateChangedHandlerId{};
   std::shared_ptr<UriEndpointState> state;
 
   void checkUri ();