diff --git a/source/RobotAPI/libraries/skills/core/FluxioParameterNode.cpp b/source/RobotAPI/libraries/skills/core/FluxioParameterNode.cpp
index 32466f4ee8a80c09e0341bf07999695b74f51f37..b88dfcf2188f68ca657de8c18f56970c1bf34878 100644
--- a/source/RobotAPI/libraries/skills/core/FluxioParameterNode.cpp
+++ b/source/RobotAPI/libraries/skills/core/FluxioParameterNode.cpp
@@ -41,7 +41,7 @@ namespace armarx
         FluxioParameterNode::FromIce(const manager::dto::FluxioNode& i,
                                      std::map<std::string, FluxioParameter>& parametersMap)
         {
-            if (i.parameterId.id == "")
+            if (i.parameterId.id.empty())
             {
                 ARMARX_WARNING << "Parameters id is dummy id in ParameterNode with id " << i.nodeId;
                 return std::nullopt;
diff --git a/source/RobotAPI/libraries/skills/core/FluxioSkill.cpp b/source/RobotAPI/libraries/skills/core/FluxioSkill.cpp
index d14138cae58d2dbb7503bafff77acfb913547f43..6acf3cf9aef6d0e3aff5d7289b09c3bf1b77c9ac 100644
--- a/source/RobotAPI/libraries/skills/core/FluxioSkill.cpp
+++ b/source/RobotAPI/libraries/skills/core/FluxioSkill.cpp
@@ -356,7 +356,7 @@ namespace armarx
                     return new FluxioParameterNode(*n);
                 }
 
-                ARMARX_WARNING << "ParameterNode with id " << i.nodeId << "could not be converted";
+                ARMARX_WARNING << "ParameterNode with id " << i.nodeId << " could not be converted";
             }
             else if (i.nodeType == "SUBSKILL")
             {
@@ -366,7 +366,7 @@ namespace armarx
                 {
                     return new FluxioSubSkillNode(*n);
                 }
-                ARMARX_WARNING << "SubSkillNode with id " << i.nodeId << "could not be converted";
+                ARMARX_WARNING << "SubSkillNode with id " << i.nodeId << " could not be converted";
             }
             else
             {
diff --git a/source/RobotAPI/libraries/skills/core/FluxioSubSkillNode.cpp b/source/RobotAPI/libraries/skills/core/FluxioSubSkillNode.cpp
index 90c509c9dd758a47d4aa10f7d5de24c0a2de814c..529406a5c7c471d145150b16183c92538900b168 100644
--- a/source/RobotAPI/libraries/skills/core/FluxioSubSkillNode.cpp
+++ b/source/RobotAPI/libraries/skills/core/FluxioSubSkillNode.cpp
@@ -40,7 +40,7 @@ namespace armarx
         FluxioSubSkillNode::FromIce(const manager::dto::FluxioNode& i,
                                     std::map<std::string, FluxioSkill>& skillsMap)
         {
-            if (i.skillId.id == "")
+            if (i.skillId.id.empty())
             {
                 ARMARX_WARNING << "Skills id is dummy id in SubSkillNode with id " << i.nodeId;
                 return std::nullopt;