diff --git a/resources/qml/SelfVerificationCheck.qml b/resources/qml/SelfVerificationCheck.qml
index c5eee669bee5a28f9d78106a9ddfe73e2dbcccea..a7a9e41af9678506dc7f7e7eb395323f4f2ed2c7 100644
--- a/resources/qml/SelfVerificationCheck.qml
+++ b/resources/qml/SelfVerificationCheck.qml
@@ -237,8 +237,8 @@ Item {
             console.log("STATUS CHANGED: " + SelfVerificationStatus.status);
             if (SelfVerificationStatus.status == SelfVerificationStatus.NoMasterKey)
                 bootstrapCrosssigning.open();
-            else if (SelfVerificationStatus.status == SelfVerificationStatus.UnverifiedMasterKey)
-                verifyMasterKey.open();
+//            else if (SelfVerificationStatus.status == SelfVerificationStatus.UnverifiedMasterKey)
+//                verifyMasterKey.open();
 
         }
 
diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
index 2481d4f9439be7a4f039c09314363c1e05dcf2e3..ea5a060dc1a4b48b3c521f9ea7944d11e57d69ea 100644
--- a/src/encryption/DeviceVerificationFlow.cpp
+++ b/src/encryption/DeviceVerificationFlow.cpp
@@ -631,8 +631,8 @@ DeviceVerificationFlow::sendVerificationRequest()
         req.to      = this->toClient.to_string();
         req.msgtype = "m.key.verification.request";
         req.body    = "User is requesting to verify keys with you. However, your client does "
-                   "not support this method, so you will need to use the legacy method of "
-                   "key verification.";
+                      "not support this method, so you will need to use the legacy method of "
+                      "key verification.";
     }
 
     send(req);
diff --git a/src/encryption/VerificationManager.h b/src/encryption/VerificationManager.h
index e00ddc10ff141fbe8f6d7f1fe8eb39fb5eaf424b..d6a39ccf8f884f688ce2a377f96b91bec47f83cd 100644
--- a/src/encryption/VerificationManager.h
+++ b/src/encryption/VerificationManager.h
@@ -45,4 +45,3 @@ private:
     bool isInitialSync_ = false;
     RoomlistModel *rooms_;
 };
-
diff --git a/src/notifications/ManagerWin.cpp b/src/notifications/ManagerWin.cpp
index 4376e4d81ea811cea2bdce8cbb972241940c7ef2..556ca028e1da6b26a4a2a6053e0065d32016d492 100644
--- a/src/notifications/ManagerWin.cpp
+++ b/src/notifications/ManagerWin.cpp
@@ -100,10 +100,16 @@ NotificationsManager::systemPostNotification(const QString &line1,
     WinToast::instance()->showToast(templ, new CustomHandler());
 }
 
-void NotificationsManager::actionInvoked(uint, QString) {}
-void NotificationsManager::notificationReplied(uint, QString) {}
+void
+NotificationsManager::actionInvoked(uint, QString)
+{}
+void
+NotificationsManager::notificationReplied(uint, QString)
+{}
 
-void NotificationsManager::notificationClosed(uint, uint) {}
+void
+NotificationsManager::notificationClosed(uint, uint)
+{}
 
 void
 NotificationsManager::removeNotification(const QString &, const QString &)
diff --git a/src/voip/WebRTCSession.cpp b/src/voip/WebRTCSession.cpp
index 801a365cb313ba4d53359f0667f89a237ccd1e7f..8e0a9f79ec2a4c77d9fcf681d04728b43799c2ce 100644
--- a/src/voip/WebRTCSession.cpp
+++ b/src/voip/WebRTCSession.cpp
@@ -1114,7 +1114,11 @@ WebRTCSession::haveLocalPiP() const
     return false;
 }
 
-bool WebRTCSession::createOffer(webrtc::CallType, uint32_t) { return false; }
+bool
+WebRTCSession::createOffer(webrtc::CallType, uint32_t)
+{
+    return false;
+}
 
 bool
 WebRTCSession::acceptOffer(const std::string &)