diff --git a/source/ArmarXGui/gui-plugins/PlotterPlugin/ArmarXPlotter.cpp b/source/ArmarXGui/gui-plugins/PlotterPlugin/ArmarXPlotter.cpp
index e46044058060fa53cf753ea54b947cb2a4a694e1..385991beb54cb5a76c177d6d5cc97e9b34138530 100644
--- a/source/ArmarXGui/gui-plugins/PlotterPlugin/ArmarXPlotter.cpp
+++ b/source/ArmarXGui/gui-plugins/PlotterPlugin/ArmarXPlotter.cpp
@@ -274,7 +274,7 @@ namespace armarx
 
         logstream << (IceUtil::Time::microSeconds(timestamp) - logStartTime).toMilliSecondsDouble();
 
-        for (const std::string f : csvHeader)
+        for (const auto& f : csvHeader)
         {
             logstream << ",";
             if (dataMaptoAppend.count(f))
diff --git a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/StateDialog.cpp b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/StateDialog.cpp
index 6e04f763ab07569ee146b04b1310b3d2960e22c8..2cbca5d7c0440edf922c41e1719db7f4ac68eda1 100644
--- a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/StateDialog.cpp
+++ b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/StateDialog.cpp
@@ -409,14 +409,14 @@ namespace armarx
             p = p->getParent();
         }
 
-        for (const std::pair<QString, statechartmodel::StateParameterPtr>& oldParamEntry : source.toStdMap())
+        for (const auto& oldParamEntry : source.toStdMap())
         {
             QString key = oldParamEntry.first;
 
             // copy default values for other profiles if the parameter still exists && the type is unchanged:
             if (newValues.contains(key) && newValues[key]->type == oldParamEntry.second->type)
             {
-                for (const std::pair<QString, QPair<VariantContainerBasePtr, QString>>& pdvEntry : oldParamEntry.second->profileDefaultValues.toStdMap())
+                for (const auto& pdvEntry : oldParamEntry.second->profileDefaultValues.toStdMap())
                 {
                     if (!profiles.contains(pdvEntry.first))
                     {
diff --git a/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/view/StateItem.cpp b/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/view/StateItem.cpp
index 78a7824b1ff996835f5d952fa5a8476a6cf57d5b..d6f3f5ffa58592376aa9a25697e5f2891a71e457 100644
--- a/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/view/StateItem.cpp
+++ b/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/view/StateItem.cpp
@@ -114,7 +114,9 @@ namespace armarx
 
         bool showStateClassName = stateClass && (instanceName != stateClass->getStateName() /*|| !showSubstates*/);
 
-        const int renderFlags = Qt::TextSingleLine | Qt::AlignTop | Qt::AlignHCenter;
+        const int renderFlags = static_cast<uint8_t>(Qt::TextSingleLine) |
+                                static_cast<uint8_t>(Qt::AlignTop) |
+                                static_cast<uint8_t>(Qt::AlignHCenter);
 
         QRectF textRect = bounds;