diff --git a/src/downloadstatstelemetry.cpp b/src/downloadstatstelemetry.cpp
index e28971b..d0ae00e 100644
--- a/src/downloadstatstelemetry.cpp
+++ b/src/downloadstatstelemetry.cpp
@@ -77,7 +77,7 @@ size_t DownloadStatsTelemetry::_curl_write_callback(char *, size_t size, size_t
 size_t DownloadStatsTelemetry::_curl_header_callback( void *ptr, size_t size, size_t nmemb, void *)
 {
     int len = size*nmemb;
-    QByteArray headerstr((char *) ptr, len);
+    //QByteArray headerstr((char *) ptr, len);
     //qDebug() << "Received telemetry header:" << headerstr;
     return len;
 }
diff --git a/src/downloadthread.cpp b/src/downloadthread.cpp
index 9ca6ecd..da1e294 100644
--- a/src/downloadthread.cpp
+++ b/src/downloadthread.cpp
@@ -1012,7 +1012,7 @@ bool DownloadThread::_customizeImage()
             f.close();
         }
 
-        for (const QByteArray& item : configItems)
+        for (const QByteArray& item : qAsConst(configItems))
         {
             if (config.contains("#"+item)) {
                 /* Uncomment existing line */
diff --git a/src/linux/linuxdrivelist.cpp b/src/linux/linuxdrivelist.cpp
index 65af81c..d49b9b6 100644
--- a/src/linux/linuxdrivelist.cpp
+++ b/src/linux/linuxdrivelist.cpp
@@ -60,8 +60,8 @@ namespace Drivelist
         }
 
         QJsonDocument d = QJsonDocument::fromJson(output);
-        QJsonArray a = d.object()["blockdevices"].toArray();
-        for (auto i : a)
+        const QJsonArray a = d.object()["blockdevices"].toArray();
+        for (const auto &i : a)
         {
             DeviceDescriptor d;
             QJsonObject bdev = i.toObject();
diff --git a/src/linux/udisks2api.cpp b/src/linux/udisks2api.cpp
index f704959..502d31f 100644
--- a/src/linux/udisks2api.cpp
+++ b/src/linux/udisks2api.cpp
@@ -56,7 +56,7 @@ QString UDisks2Api::_resolveDevice(const QString &device)
     if (!manager.isValid() || !list.isValid() || list.value().isEmpty())
         return QString();
 
-    return list.value().first().path();
+    return list.value().constFirst().path();
 }
 
 void UDisks2Api::_unmountDrive(const QString &driveDbusPath)
@@ -66,12 +66,13 @@ void UDisks2Api::_unmountDrive(const QString &driveDbusPath)
     QDBusInterface manager("org.freedesktop.UDisks2", "/org/freedesktop/UDisks2/Manager",
                            "org.freedesktop.UDisks2.Manager", QDBusConnection::systemBus());
     QVariantMap options;
-    QDBusReply<QList<QDBusObjectPath>> list = manager.call("GetBlockDevices", options);
+    const QDBusReply<QList<QDBusObjectPath>> list = manager.call("GetBlockDevices", options);
 
     if (!manager.isValid() || !list.isValid())
         return;
 
-    for (const auto& devpath : list.value())
+    const auto listValue = list.value();
+    for (const auto& devpath : listValue)
     {
         QString devpathStr = devpath.path();
 
@@ -263,7 +264,8 @@ QByteArrayList UDisks2Api::mountPoints(const QDBusInterface &filesystem)
     QVariantList args = {"org.freedesktop.UDisks2.Filesystem", "MountPoints"};
     msg.setArguments(args);
     QDBusMessage reply = QDBusConnection::systemBus().call(msg);
-    for (const auto& arg : reply.arguments())
+    const auto replyArgs = reply.arguments();
+    for (const auto& arg : replyArgs)
     {
         arg.value<QDBusVariant>().variant().value<QDBusArgument>() >> mps;
     }
diff --git a/src/main.cpp b/src/main.cpp
index 75940a7..8406771 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -92,7 +92,6 @@ int main(int argc, char *argv[])
     ImageWriter imageWriter;
     NetworkAccessManagerFactory namf;
     QQmlApplicationEngine engine;
-    QTranslator *translator = new QTranslator;
     QString customQm;
     QSettings settings;
 
@@ -206,6 +205,7 @@ int main(int argc, char *argv[])
         }
     }
 
+    QTranslator *translator = new QTranslator;
     if (customQm.isEmpty())
     {
 #ifdef Q_OS_DARWIN