diff --git a/app/watchdog_service.cpp b/app/watchdog_service.cpp
index c567ca9..0eedf1b 100644
--- a/app/watchdog_service.cpp
+++ b/app/watchdog_service.cpp
@@ -153,7 +153,8 @@
         if (wasValid)
         {
             // Retry the request once in case the cached service was stale
-            return setProperty(key, val);
+            setProperty(key, val);
+            return;
         }
         log<level::ERR>("WatchdogService: Method error setting property",
                         entry("PROPERTY=%s", key.c_str()));
diff --git a/host-interface.cpp b/host-interface.cpp
index 69ab376..1f9bfcb 100644
--- a/host-interface.cpp
+++ b/host-interface.cpp
@@ -54,7 +54,7 @@
                                          std::placeholders::_1,
                                          std::placeholders::_2));
 
-    return ipmid_send_cmd_to_host(std::move(cmd));
+    ipmid_send_cmd_to_host(std::move(cmd));
 }
 
 // Called into by Command Manager
diff --git a/user_channel/user_mgmt.cpp b/user_channel/user_mgmt.cpp
index bf43f88..d0dcb38 100644
--- a/user_channel/user_mgmt.cpp
+++ b/user_channel/user_mgmt.cpp
@@ -1635,7 +1635,7 @@
             auto usrObj = managedObjs.find(usersPath);
             if (usrObj != managedObjs.end())
             {
-                bool usrEnabled;
+                bool usrEnabled = false;
 
                 // User exist. Lets check and update other fileds
                 getUserObjProperties(usrObj->second, usrGrps, usrPriv,
@@ -1692,7 +1692,7 @@
     {
         std::vector<std::string> usrGrps;
         std::string usrPriv, userName;
-        bool usrEnabled;
+        bool usrEnabled = false;
         std::string usrObjPath = std::string(usrObj.first);
         if (getUserNameFromPath(usrObj.first.str, userName) != 0)
         {