diff --git a/redfish-core/include/utils/json_utils.hpp b/redfish-core/include/utils/json_utils.hpp
index 0d4bee2..a7a27ff 100644
--- a/redfish-core/include/utils/json_utils.hpp
+++ b/redfish-core/include/utils/json_utils.hpp
@@ -410,7 +410,7 @@
         messages::unrecognizedRequestBody(res);
         return false;
     }
-    for (auto& item : jsonRequest.items())
+    for (const auto& item : jsonRequest.items())
     {
         size_t unpackIndex = 0;
         for (; unpackIndex < toUnpack.size(); unpackIndex++)
diff --git a/redfish-core/lib/event_service.hpp b/redfish-core/lib/event_service.hpp
index 29175ab..9c5b378 100644
--- a/redfish-core/lib/event_service.hpp
+++ b/redfish-core/lib/event_service.hpp
@@ -573,7 +573,7 @@
             boost::beast::http::fields fields;
             for (const nlohmann::json& headerChunk : *headers)
             {
-                for (auto& it : headerChunk.items())
+                for (const auto& it : headerChunk.items())
                 {
                     const std::string* value =
                         it.value().get_ptr<const std::string*>();
diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp
index 9acf568..ab99dc3 100644
--- a/redfish-core/lib/update_service.hpp
+++ b/redfish-core/lib/update_service.hpp
@@ -249,6 +249,8 @@
                 "xyz.openbmc_project.ObjectMapper", "GetObject", objPath.str,
                 std::array<const char*, 1>{
                     "xyz.openbmc_project.Software.Activation"});
+
+            break;
         }
     }
 }