diff --git a/src/core/toxcall.cpp b/src/core/toxcall.cpp
index 2591c3a12..be4131024 100644
--- a/src/core/toxcall.cpp
+++ b/src/core/toxcall.cpp
@@ -29,8 +29,8 @@
  */
 
 ToxCall::ToxCall(uint32_t CallId, bool VideoEnabled, CoreAV& av)
-    : videoEnabled{VideoEnabled}
-    , av{&av}
+    : av{&av}
+    , videoEnabled{VideoEnabled}
 {
     Audio& audio = Audio::getInstance();
     audio.subscribeInput();
diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp
index 5f36c26c8..1230814d0 100644
--- a/src/widget/form/chatform.cpp
+++ b/src/widget/form/chatform.cpp
@@ -759,7 +759,6 @@ void ChatForm::handleLoadedMessages(QList<History::HistMessage> newHistMsgs, boo
     ToxPk prevIdBackup = previousId;
     previousId = ToxPk{};
     QList<ChatLine::Ptr> chatLines;
-    Core* core = Core::getInstance();
     QDate lastDate(1, 0, 0);
     for (const auto& histMessage : newHistMsgs) {
         MessageMetadata const metadata = getMessageMetadata(histMessage);
diff --git a/src/widget/form/chatform.h b/src/widget/form/chatform.h
index a6f1942f2..84790abd0 100644
--- a/src/widget/form/chatform.h
+++ b/src/widget/form/chatform.h
@@ -117,8 +117,8 @@ private:
         const ToxPk authorPk;
         const QDateTime msgDateTime;
         MessageMetadata(bool isSelf, bool needSending, bool isAction, qint64 id, ToxPk authorPk, QDateTime msgDateTime) :
-            needSending{needSending},
             isSelf{isSelf},
+            needSending{needSending},
             isAction{isAction},
             id{id},
             authorPk{authorPk},