diff --git a/src/test/controllerrenderingengine_test.cpp b/src/test/controllerrenderingengine_test.cpp
index 885ae68df15..7319419de04 100644
--- a/src/test/controllerrenderingengine_test.cpp
+++ b/src/test/controllerrenderingengine_test.cpp
@@ -34,7 +34,8 @@ class MockRenderingEngine : public ControllerRenderingEngine {
 };
 
 TEST_F(ControllerRenderingEngineTest, createValidRendererWithSupportedTypes) {
-    for (auto pixelFormat : supportedPixelFormat()) {
+    const auto& supportedPixelFormats = supportedPixelFormat();
+    for (const auto& pixelFormat : supportedPixelFormats) {
         MockRenderingEngine screenTest(LegacyControllerMapping::ScreenInfo{
                 "",                                                    // identifier
                 QSize(0, 0),                                           // size
diff --git a/src/track/steminfoimporter.cpp b/src/track/steminfoimporter.cpp
index cbff8593a20..54db7d9c906 100644
--- a/src/track/steminfoimporter.cpp
+++ b/src/track/steminfoimporter.cpp
@@ -171,7 +171,7 @@ QList<StemInfo> StemInfoImporter::importStemInfos(
         kLogger.debug() << "Unexpected or missing stems value in STEM manifest";
         return {};
     }
-    auto stemArray = stems.toArray();
+    const auto stemArray = stems.toArray();
     QList<StemInfo> stemsList;
     stemsList.reserve(stemArray.size());
     int stemIdx = 0;