diff --git a/src/accountadapter.cpp b/src/accountadapter.cpp
index 94cdb6fce14a731394fe2c8f42a47dcad1ab5665..62a3801659da7f8cb392439552a9de4576a38ef2 100644
--- a/src/accountadapter.cpp
+++ b/src/accountadapter.cpp
@@ -27,8 +27,8 @@
 
 #include <QtConcurrent/QtConcurrent>
 
-AccountAdapter::AccountAdapter(QObject* parent, LRCInstance* instance)
-    : QmlAdapterBase(parent, instance)
+AccountAdapter::AccountAdapter(LRCInstance* instance, QObject* parent)
+    : QmlAdapterBase(instance, parent)
 {}
 
 void
diff --git a/src/accountadapter.h b/src/accountadapter.h
index 6afb8d31f2fb8d51d609df5735182e6e5d26d5ba..8abaf3b161bad7f7105c2095617681d6f6494ece 100644
--- a/src/accountadapter.h
+++ b/src/accountadapter.h
@@ -50,7 +50,7 @@ signals:
     void accountListSizeChanged();
 
 public:
-    explicit AccountAdapter(QObject* parent = nullptr, LRCInstance* instance = nullptr);
+    explicit AccountAdapter(LRCInstance* instance, QObject* parent = nullptr);
     ~AccountAdapter() = default;
 
 protected:
diff --git a/src/avadapter.cpp b/src/avadapter.cpp
index 65f7ccded6a333ad6333fb78bf358c1153410362..1b3b6f26159f9d4733d1dc651fc465ac3ae5bcb3 100644
--- a/src/avadapter.cpp
+++ b/src/avadapter.cpp
@@ -32,8 +32,8 @@
 #include <QPainter>
 #include <QScreen>
 
-AvAdapter::AvAdapter(QObject* parent, LRCInstance* instance)
-    : QmlAdapterBase(parent, instance)
+AvAdapter::AvAdapter(LRCInstance* instance, QObject* parent)
+    : QmlAdapterBase(instance, parent)
 {
     auto& avModel = lrcInstance_->avModel();
 
diff --git a/src/avadapter.h b/src/avadapter.h
index d3a66ed54af475e9431ce06d8e0f8b9a9cfe91e0..58e246b46ea6b749c1d247fe6eb59107d8f1c4d2 100644
--- a/src/avadapter.h
+++ b/src/avadapter.h
@@ -29,7 +29,7 @@ class AvAdapter final : public QmlAdapterBase
     Q_OBJECT
 
 public:
-    explicit AvAdapter(QObject* parent = nullptr, LRCInstance* instance = nullptr);
+    explicit AvAdapter(LRCInstance* instance, QObject* parent = nullptr);
     ~AvAdapter() = default;
 
 signals:
diff --git a/src/calladapter.cpp b/src/calladapter.cpp
index 6686cc5f0c6d0761396e4017b9b8f704e7ff3e1f..ba9030bbd2d870085d5468982161aaf63fe41f4e 100644
--- a/src/calladapter.cpp
+++ b/src/calladapter.cpp
@@ -27,8 +27,8 @@
 
 #include <QApplication>
 
-CallAdapter::CallAdapter(QObject* parent, LRCInstance* instance)
-    : QmlAdapterBase(parent, instance)
+CallAdapter::CallAdapter(LRCInstance* instance, QObject* parent)
+    : QmlAdapterBase(instance, parent)
     , oneSecondTimer_(new QTimer(this))
 {
     accountId_ = lrcInstance_->getCurrAccId();
diff --git a/src/calladapter.h b/src/calladapter.h
index 5ec947b3471898217e19dbfa9c14ae14ef2c66bd..3a057971bbf4881ae039e60dcaf64019ca9853cb 100644
--- a/src/calladapter.h
+++ b/src/calladapter.h
@@ -21,7 +21,6 @@
 
 #include "lrcinstance.h"
 #include "qmladapterbase.h"
-#include "globalsystemtray.h"
 #include "screensaver.h"
 
 #include <QObject>
@@ -37,7 +36,7 @@ public:
     enum MuteStates { UNMUTED, LOCAL_MUTED, MODERATOR_MUTED, BOTH_MUTED };
     Q_ENUM(MuteStates)
 
-    explicit CallAdapter(QObject* parent = nullptr, LRCInstance* instance = nullptr);
+    explicit CallAdapter(LRCInstance* instance, QObject* parent = nullptr);
     ~CallAdapter() = default;
 
 protected:
diff --git a/src/contactadapter.cpp b/src/contactadapter.cpp
index b62bba70f94c32f5d6334b088fd2f59b580a6e21..1d8f712ce9c3fd8a17a36678487153f0f66577f2 100644
--- a/src/contactadapter.cpp
+++ b/src/contactadapter.cpp
@@ -22,8 +22,8 @@
 
 #include "lrcinstance.h"
 
-ContactAdapter::ContactAdapter(QObject* parent, LRCInstance* instance)
-    : QmlAdapterBase(parent, instance)
+ContactAdapter::ContactAdapter(LRCInstance* instance, QObject* parent)
+    : QmlAdapterBase(instance, parent)
 {
     selectableProxyModel_.reset(new SelectableProxyModel(smartListModel_.get()));
 }
diff --git a/src/contactadapter.h b/src/contactadapter.h
index f0e77294267fd6cefb5a16881aea9f8032f97aed..54c02a7c2d6e13b6e44a7bc1c992613b42d44fcf 100644
--- a/src/contactadapter.h
+++ b/src/contactadapter.h
@@ -72,7 +72,7 @@ class ContactAdapter final : public QmlAdapterBase
     Q_OBJECT
 
 public:
-    explicit ContactAdapter(QObject* parent = nullptr, LRCInstance* instance = nullptr);
+    explicit ContactAdapter(LRCInstance* instance, QObject* parent = nullptr);
     ~ContactAdapter() = default;
 
 protected:
diff --git a/src/conversationsadapter.cpp b/src/conversationsadapter.cpp
index 038f135ac952295af53ba8363dddcfcec7c3942d..961f4bb187d309df042e6c2f46a865d34049b8d5 100644
--- a/src/conversationsadapter.cpp
+++ b/src/conversationsadapter.cpp
@@ -28,8 +28,8 @@
 
 #include <QApplication>
 
-ConversationsAdapter::ConversationsAdapter(QObject* parent, LRCInstance* instance)
-    : QmlAdapterBase(parent, instance)
+ConversationsAdapter::ConversationsAdapter(LRCInstance* instance, QObject* parent)
+    : QmlAdapterBase(instance, parent)
 {
     connect(this, &ConversationsAdapter::currentTypeFilterChanged, [this]() {
         lrcInstance_->getCurrentConversationModel()->setFilter(currentTypeFilter_);
diff --git a/src/conversationsadapter.h b/src/conversationsadapter.h
index fa201b80794bbf4b959372b871d66c5f1fbda6ec..6961229b7c77fef69c56682d24baf0040a13aebd 100644
--- a/src/conversationsadapter.h
+++ b/src/conversationsadapter.h
@@ -32,7 +32,7 @@ class ConversationsAdapter final : public QmlAdapterBase
     Q_PROPERTY(lrc::api::profile::Type currentTypeFilter MEMBER currentTypeFilter_ NOTIFY
                    currentTypeFilterChanged)
 public:
-    explicit ConversationsAdapter(QObject* parent = nullptr, LRCInstance* instance = nullptr);
+    explicit ConversationsAdapter(LRCInstance* instance, QObject* parent = nullptr);
     ~ConversationsAdapter() = default;
 
 protected:
diff --git a/src/messagesadapter.cpp b/src/messagesadapter.cpp
index 95f08a566e405c3e7dbf4bf27da37a599a88beec..82947582832dc7b34a27eddd6b2ef5389c8591b4 100644
--- a/src/messagesadapter.cpp
+++ b/src/messagesadapter.cpp
@@ -23,7 +23,6 @@
 
 #include "messagesadapter.h"
 
-#include "globalsystemtray.h"
 #include "qtutils.h"
 #include "utils.h"
 #include "webchathelpers.h"
@@ -36,8 +35,8 @@
 #include <QList>
 #include <QUrl>
 
-MessagesAdapter::MessagesAdapter(QObject* parent, LRCInstance* instance)
-    : QmlAdapterBase(parent, instance)
+MessagesAdapter::MessagesAdapter(LRCInstance* instance, QObject* parent)
+    : QmlAdapterBase(instance, parent)
 {}
 
 void
@@ -714,7 +713,7 @@ MessagesAdapter::removeConversation(const QString& accountId,
     }
 
     lrcInstance_->getAccountInfo(accountId).conversationModel->removeConversation(convUid,
-                                                                                 banContact);
+                                                                                  banContact);
     if (convUid == currentConvUid_)
         currentConvUid_.clear();
 }
diff --git a/src/messagesadapter.h b/src/messagesadapter.h
index 13d0398c2ce0b0281767bb82e2295a2a63858311..cf9f3c47f6263a1c2ab4248637a86308e66eae63 100644
--- a/src/messagesadapter.h
+++ b/src/messagesadapter.h
@@ -31,7 +31,7 @@ class MessagesAdapter final : public QmlAdapterBase
     Q_PROPERTY(QVariantMap chatviewTranslatedStrings MEMBER chatviewTranslatedStrings_ CONSTANT)
 
 public:
-    explicit MessagesAdapter(QObject* parent = nullptr, LRCInstance* instance = nullptr);
+    explicit MessagesAdapter(LRCInstance* instance, QObject* parent = nullptr);
     ~MessagesAdapter() = default;
 
 protected:
diff --git a/src/pluginadapter.cpp b/src/pluginadapter.cpp
index 87b28b6922a0434c0d8698a7a6424fac54be6420..6b1e99b4441c5991894315ef8f321810d40f02d0 100644
--- a/src/pluginadapter.cpp
+++ b/src/pluginadapter.cpp
@@ -20,8 +20,8 @@
 
 #include "lrcinstance.h"
 
-PluginAdapter::PluginAdapter(QObject* parent, LRCInstance* instance)
-    : QmlAdapterBase(parent, instance)
+PluginAdapter::PluginAdapter(LRCInstance* instance, QObject* parent)
+    : QmlAdapterBase(instance, parent)
 {}
 
 QVariant
diff --git a/src/pluginadapter.h b/src/pluginadapter.h
index c902a804f75014746800baf6d95b76015abf6965..48cb83c21cf3339068d904f2fb69ea8836021d59 100644
--- a/src/pluginadapter.h
+++ b/src/pluginadapter.h
@@ -32,7 +32,7 @@ class PluginAdapter final : public QmlAdapterBase
 {
     Q_OBJECT
 public:
-    explicit PluginAdapter(QObject* parent = nullptr, LRCInstance* instance = nullptr);
+    explicit PluginAdapter(LRCInstance* instance, QObject* parent = nullptr);
     ~PluginAdapter() = default;
 
 protected:
diff --git a/src/qmladapterbase.h b/src/qmladapterbase.h
index b422d326681c63c5e60c3cc37d29a9d7d5b39007..546f4fcfcc57c090f223b6b7df0744fa32a4532a 100644
--- a/src/qmladapterbase.h
+++ b/src/qmladapterbase.h
@@ -28,7 +28,7 @@ class QmlAdapterBase : public QObject
 {
     Q_OBJECT
 public:
-    explicit QmlAdapterBase(QObject* parent = nullptr, LRCInstance* instance = nullptr)
+    explicit QmlAdapterBase(LRCInstance* instance, QObject* parent = nullptr)
         : QObject(parent)
         , qmlObj_(nullptr)
         , lrcInstance_(instance) {};
diff --git a/src/settingsadapter.cpp b/src/settingsadapter.cpp
index ea329887d0926626e66ed1bdbd7a96ce9c73d802..34551a1c9fc501185591943c32a1f99a47ecd5fd 100644
--- a/src/settingsadapter.cpp
+++ b/src/settingsadapter.cpp
@@ -20,8 +20,8 @@
 
 #include "api/newdevicemodel.h"
 
-SettingsAdapter::SettingsAdapter(QObject* parent, LRCInstance* instance)
-    : QmlAdapterBase(parent, instance)
+SettingsAdapter::SettingsAdapter(LRCInstance* instance, QObject* parent)
+    : QmlAdapterBase(instance, parent)
 {}
 
 QString
diff --git a/src/settingsadapter.h b/src/settingsadapter.h
index e712cb7d8b2c5cf2ab540bbdb665f84249319a17..0e164f2cae1722ce7b1c3c1943f3b60520d4b873 100644
--- a/src/settingsadapter.h
+++ b/src/settingsadapter.h
@@ -32,7 +32,7 @@ class SettingsAdapter : public QmlAdapterBase
 {
     Q_OBJECT
 public:
-    explicit SettingsAdapter(QObject* parent = nullptr, LRCInstance* instance = nullptr);
+    explicit SettingsAdapter(LRCInstance* instance, QObject* parent = nullptr);
 
     void safeInit() override {}
 
diff --git a/src/updatemanager.cpp b/src/updatemanager.cpp
index 929af419e3b9e77519d86fab216be3217b7f7f81..a57488e3d1284050631af9097869c9bfcfe6c46d 100644
--- a/src/updatemanager.cpp
+++ b/src/updatemanager.cpp
@@ -18,7 +18,6 @@
 
 #include "updatemanager.h"
 
-#include "appsettingsmanager.h"
 #include "lrcinstance.h"
 #include "utils.h"
 #include "version.h"
@@ -39,10 +38,10 @@ UpdateManager::UpdateManager(const QString& url,
                              LRCInstance* instance,
                              QObject* parent)
     : NetWorkManager(cm, parent)
+    , lrcInstance_(instance)
     , baseUrl_(url.isEmpty() ? "https://dl.jami.net/windows" : url.toLatin1())
     , tempPath_(Utils::WinGetEnv("TEMP"))
     , updateTimer_(new QTimer(this))
-    , lrcInstance_(instance)
 {
     connect(updateTimer_, &QTimer::timeout, [this] {
         // Quiet period update check.
diff --git a/src/utilsadapter.cpp b/src/utilsadapter.cpp
index 4ab6a6789180994249d490f6158f7776a3274981..a1545cb3bb142fbbec3aca8e416bf9c0f3bdd8a9 100644
--- a/src/utilsadapter.cpp
+++ b/src/utilsadapter.cpp
@@ -31,8 +31,8 @@
 #include <QClipboard>
 #include <QFileInfo>
 
-UtilsAdapter::UtilsAdapter(QObject* parent, LRCInstance* instance)
-    : QmlAdapterBase(parent, instance)
+UtilsAdapter::UtilsAdapter(LRCInstance* instance, QObject* parent)
+    : QmlAdapterBase(instance, parent)
     , clipboard_(QApplication::clipboard())
 {}
 
diff --git a/src/utilsadapter.h b/src/utilsadapter.h
index 5eb3d29c13d6d09a80c4eeae840c740df0c83c99..4eb730159a97e6a51d91db83adaf0a9c63582c0c 100644
--- a/src/utilsadapter.h
+++ b/src/utilsadapter.h
@@ -33,7 +33,7 @@ class UtilsAdapter final : public QmlAdapterBase
 {
     Q_OBJECT
 public:
-    explicit UtilsAdapter(QObject* parent = nullptr, LRCInstance* instance = nullptr);
+    explicit UtilsAdapter(LRCInstance* instance, QObject* parent = nullptr);
     ~UtilsAdapter() = default;
 
     void safeInit() override {}