diff --git a/src/csync/vio/csync_vio_local_unix.cpp b/src/csync/vio/csync_vio_local_unix.cpp
index ed045b16e1..c5e22abb3c 100644
--- a/src/csync/vio/csync_vio_local_unix.cpp
+++ b/src/csync/vio/csync_vio_local_unix.cpp
@@ -125,7 +125,7 @@ std::unique_ptr<csync_file_stat_t> csync_vio_local_readdir(csync_vio_handle_t *h
       // Directly modifies file_stat->type.
       // We can ignore the return value since we're done here anyway.
       const auto result = vfs->statTypeVirtualFile(file_stat.get(), &handle->path);
-      Q_UNUSED(result);
+      Q_UNUSED(result)
   }
 
   return file_stat;
diff --git a/src/gui/tray/UserModel.cpp b/src/gui/tray/UserModel.cpp
index aa36c0d9ba..9073925719 100644
--- a/src/gui/tray/UserModel.cpp
+++ b/src/gui/tray/UserModel.cpp
@@ -79,7 +79,7 @@ void User::showDesktopNotification(const QString &title, const QString &message)
     }
 
     // after one hour, clear the gui log notification store
-    constexpr quint64 clearGuiLogInterval = 60 * 60 * 1000;
+    constexpr qint64 clearGuiLogInterval = 60 * 60 * 1000;
     if (_guiLogTimer.elapsed() > clearGuiLogInterval) {
         _notificationCache.clear();
     }
diff --git a/test/pushnotificationstestutils.cpp b/test/pushnotificationstestutils.cpp
index 60727592f9..389d41dd7f 100644
--- a/test/pushnotificationstestutils.cpp
+++ b/test/pushnotificationstestutils.cpp
@@ -1,6 +1,7 @@
 #include <QLoggingCategory>
 #include <QSignalSpy>
 #include <QTest>
+#include <cstdint>
 #include <functional>
 
 #include "pushnotificationstestutils.h"
@@ -116,15 +117,15 @@ uint32_t FakeWebSocketServer::textMessagesCount() const
     return _processTextMessageSpy->count();
 }
 
-QString FakeWebSocketServer::textMessage(uint32_t messageNumber) const
+QString FakeWebSocketServer::textMessage(int messageNumber) const
 {
-    Q_ASSERT(messageNumber < _processTextMessageSpy->count());
+    Q_ASSERT(0 <= messageNumber && messageNumber < _processTextMessageSpy->count());
     return _processTextMessageSpy->at(messageNumber).at(1).toString();
 }
 
-QWebSocket *FakeWebSocketServer::socketForTextMessage(uint32_t messageNumber) const
+QWebSocket *FakeWebSocketServer::socketForTextMessage(int messageNumber) const
 {
-    Q_ASSERT(messageNumber < _processTextMessageSpy->count());
+    Q_ASSERT(0 <= messageNumber && messageNumber < _processTextMessageSpy->count());
     return _processTextMessageSpy->at(messageNumber).at(0).value<QWebSocket *>();
 }
 
diff --git a/test/pushnotificationstestutils.h b/test/pushnotificationstestutils.h
index 12c14d1e57..f1eca050f9 100644
--- a/test/pushnotificationstestutils.h
+++ b/test/pushnotificationstestutils.h
@@ -40,9 +40,9 @@ public:
 
     uint32_t textMessagesCount() const;
 
-    QString textMessage(uint32_t messageNumber) const;
+    QString textMessage(int messageNumber) const;
 
-    QWebSocket *socketForTextMessage(uint32_t messageNumber) const;
+    QWebSocket *socketForTextMessage(int messageNumber) const;
 
     void clearTextMessages();