diff --git a/src/base/bittorrent/infohash.cpp b/src/base/bittorrent/infohash.cpp
index 0e37c7509..0080bf9b5 100644
--- a/src/base/bittorrent/infohash.cpp
+++ b/src/base/bittorrent/infohash.cpp
@@ -91,7 +91,7 @@ bool InfoHash::operator!=(const InfoHash &other) const
     return (m_nativeHash != other.m_nativeHash);
 }
 
-uint qHash(const InfoHash &key, uint seed)
+uint BitTorrent::qHash(const InfoHash &key, uint seed)
 {
     return qHash(static_cast<QString>(key), seed);
 }
diff --git a/src/base/bittorrent/infohash.h b/src/base/bittorrent/infohash.h
index 9b1291672..ce8eaebcf 100644
--- a/src/base/bittorrent/infohash.h
+++ b/src/base/bittorrent/infohash.h
@@ -54,8 +54,8 @@ namespace BitTorrent
         libtorrent::sha1_hash m_nativeHash;
         QString m_hashString;
     };
-}
 
-uint qHash(const BitTorrent::InfoHash &key, uint seed);
+    uint qHash(const InfoHash &key, uint seed);
+}
 
 #endif // BITTORRENT_INFOHASH_H
diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp
index f587e82f6..0c385b29d 100644
--- a/src/base/bittorrent/session.cpp
+++ b/src/base/bittorrent/session.cpp
@@ -3748,7 +3748,7 @@ void Session::recursiveTorrentDownload(const InfoHash &hash)
             Logger::instance()->addMessage(
                         tr("Recursive download of file '%1' embedded in torrent '%2'"
                            , "Recursive download of 'test.torrent' embedded in torrent 'test2'")
-                        .arg(Utils::Fs::toNativePath(torrentRelpath)).arg(torrent->name()));
+                        .arg(Utils::Fs::toNativePath(torrentRelpath), torrent->name()));
             const QString torrentFullpath = torrent->savePath() + "/" + torrentRelpath;
 
             AddTorrentParams params;
diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp
index d4970588a..d4027b3d2 100644
--- a/src/base/utils/misc.cpp
+++ b/src/base/utils/misc.cpp
@@ -597,7 +597,7 @@ void Utils::Misc::openFolderSelect(const QString &absolutePath)
 {
     const QString path = Utils::Fs::fromNativePath(absolutePath);
     // If the item to select doesn't exist, try to open its parent
-    if (!QFileInfo(path).exists()) {
+    if (!QFileInfo::exists(path)) {
         openPath(path.left(path.lastIndexOf("/")));
         return;
     }
diff --git a/src/gui/fspathedit.cpp b/src/gui/fspathedit.cpp
index 2f9b0ee70..f14bc99b7 100644
--- a/src/gui/fspathedit.cpp
+++ b/src/gui/fspathedit.cpp
@@ -190,7 +190,7 @@ FileSystemPathEdit::FileSystemPathEdit(Private::FileEditorWithCompletion *editor
     layout->addWidget(editor->widget());
     layout->addWidget(d->m_browseBtn);
 
-    connect(d->m_browseAction, &QAction::triggered, [this]() {this->d_func()->browseActionTriggered();});
+    connect(d->m_browseAction, &QAction::triggered, this, [this]() { this->d_func()->browseActionTriggered(); });
 }
 
 FileSystemPathEdit::~FileSystemPathEdit() = default;
diff --git a/src/gui/optionsdlg.cpp b/src/gui/optionsdlg.cpp
index 6a1ae2cbe..a8d11efe2 100644
--- a/src/gui/optionsdlg.cpp
+++ b/src/gui/optionsdlg.cpp
@@ -392,7 +392,7 @@ OptionsDialog::OptionsDialog(QWidget *parent)
     connect(m_ui->textSmartEpisodeFilters, &QPlainTextEdit::textChanged, this, &OptionsDialog::enableApplyButton);
     connect(m_ui->spinRSSRefreshInterval, qSpinBoxValueChanged, this, &OptionsDialog::enableApplyButton);
     connect(m_ui->spinRSSMaxArticlesPerFeed, qSpinBoxValueChanged, this, &OptionsDialog::enableApplyButton);
-    connect(m_ui->btnEditRules, &QPushButton::clicked, [this]() { AutomatedRssDownloader(this).exec(); });
+    connect(m_ui->btnEditRules, &QPushButton::clicked, this, [this]() { AutomatedRssDownloader(this).exec(); });
 
     // Disable apply Button
     applyButton->setEnabled(false);
diff --git a/src/gui/properties/speedplotview.h b/src/gui/properties/speedplotview.h
index 6c92166fc..ea48e00ee 100644
--- a/src/gui/properties/speedplotview.h
+++ b/src/gui/properties/speedplotview.h
@@ -69,7 +69,7 @@ public:
 
     struct PointData
     {
-        uint x;
+        qint64 x;
         int y[NB_GRAPHS];
     };
 
diff --git a/src/gui/properties/speedwidget.cpp b/src/gui/properties/speedwidget.cpp
index fde4eb5cf..513f77cea 100644
--- a/src/gui/properties/speedwidget.cpp
+++ b/src/gui/properties/speedwidget.cpp
@@ -137,7 +137,7 @@ void SpeedWidget::update()
     const BitTorrent::SessionStatus &btStatus = BitTorrent::Session::instance()->status();
 
     SpeedPlotView::PointData point;
-    point.x = QDateTime::currentDateTime().toTime_t();
+    point.x = QDateTime::currentMSecsSinceEpoch() / 1000;
     point.y[SpeedPlotView::UP] = btStatus.uploadRate;
     point.y[SpeedPlotView::DOWN] = btStatus.downloadRate;
     point.y[SpeedPlotView::PAYLOAD_UP] = btStatus.payloadUploadRate;
diff --git a/src/gui/speedlimitdlg.h b/src/gui/speedlimitdlg.h
index 9c8692214..222e5ccc0 100644
--- a/src/gui/speedlimitdlg.h
+++ b/src/gui/speedlimitdlg.h
@@ -52,10 +52,11 @@ public:
 protected slots:
     void updateSpinValue(int val) const;
     void updateSliderValue(int val) const;
-    long getSpeedLimit() const;
     void setupDialog(long max_slider, long val) const;
 
 private:
+    long getSpeedLimit() const;
+
     Ui::bandwidth_dlg *m_ui;
 };
 
diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp
index e46303923..4fd07a250 100644
--- a/src/gui/transferlistwidget.cpp
+++ b/src/gui/transferlistwidget.cpp
@@ -132,7 +132,7 @@ namespace
         , m_sizeHint(QCheckBox(m_text).sizeHint())
     {
         m_checkBox->setCheckState(initialState);
-        connect(m_checkBox, &QCheckBox::stateChanged, [this, onToggle](int newState)
+        connect(m_checkBox, &QCheckBox::stateChanged, this, [this, onToggle](int newState)
         {
             m_checkBox->setTristate(false);
             onToggle(static_cast<Qt::CheckState>(newState));
diff --git a/src/webui/api/authcontroller.cpp b/src/webui/api/authcontroller.cpp
index 71d190dc6..e2422c6f8 100644
--- a/src/webui/api/authcontroller.cpp
+++ b/src/webui/api/authcontroller.cpp
@@ -78,7 +78,7 @@ void AuthController::logoutAction()
 
 bool AuthController::isBanned() const
 {
-    const uint now = QDateTime::currentDateTime().toTime_t();
+    const qint64 now = QDateTime::currentMSecsSinceEpoch() / 1000;
     const FailedLogin failedLogin = m_clientFailedLogins.value(sessionManager()->clientId());
 
     bool isBanned = (failedLogin.bannedAt > 0);
@@ -103,6 +103,6 @@ void AuthController::increaseFailedAttempts()
     if (failedLogin.failedAttemptsCount == MAX_AUTH_FAILED_ATTEMPTS) {
         // Max number of failed attempts reached
         // Start ban period
-        failedLogin.bannedAt = QDateTime::currentDateTime().toTime_t();
+        failedLogin.bannedAt = QDateTime::currentMSecsSinceEpoch() / 1000;
     }
 }
diff --git a/src/webui/api/authcontroller.h b/src/webui/api/authcontroller.h
index 88d8cf861..287aee3da 100644
--- a/src/webui/api/authcontroller.h
+++ b/src/webui/api/authcontroller.h
@@ -53,7 +53,7 @@ private:
     struct FailedLogin
     {
         int failedAttemptsCount = 0;
-        uint bannedAt = 0;
+        qint64 bannedAt = 0;
     };
     mutable QHash<QString, FailedLogin> m_clientFailedLogins;
 };
diff --git a/src/webui/webapplication.cpp b/src/webui/webapplication.cpp
index 8291a2371..710404823 100644
--- a/src/webui/webapplication.cpp
+++ b/src/webui/webapplication.cpp
@@ -547,7 +547,7 @@ void WebApplication::sessionInitialize()
     if (!sessionId.isEmpty()) {
         m_currentSession = m_sessions.value(sessionId);
         if (m_currentSession) {
-            const uint now = QDateTime::currentDateTime().toTime_t();
+            const qint64 now = QDateTime::currentMSecsSinceEpoch() / 1000;
             if ((now - m_currentSession->m_timestamp) > INACTIVE_TIME) {
                 // session is outdated - removing it
                 delete m_sessions.take(sessionId);
@@ -605,7 +605,7 @@ void WebApplication::sessionStart()
     Q_ASSERT(!m_currentSession);
 
     // remove outdated sessions
-    const uint now = QDateTime::currentDateTime().toTime_t();
+    const qint64 now = QDateTime::currentMSecsSinceEpoch() / 1000;
     foreach (const auto session, m_sessions) {
         if ((now - session->timestamp()) > INACTIVE_TIME)
             delete m_sessions.take(session->id());
@@ -737,7 +737,7 @@ QString WebSession::id() const
     return m_sid;
 }
 
-uint WebSession::timestamp() const
+qint64 WebSession::timestamp() const
 {
     return m_timestamp;
 }
@@ -754,5 +754,5 @@ void WebSession::setData(const QString &id, const QVariant &data)
 
 void WebSession::updateTimestamp()
 {
-    m_timestamp = QDateTime::currentDateTime().toTime_t();
+    m_timestamp = QDateTime::currentMSecsSinceEpoch() / 1000;
 }
diff --git a/src/webui/webapplication.h b/src/webui/webapplication.h
index 4cfdfe78b..1d613eccb 100644
--- a/src/webui/webapplication.h
+++ b/src/webui/webapplication.h
@@ -59,7 +59,7 @@ public:
     explicit WebSession(const QString &sid);
 
     QString id() const override;
-    uint timestamp() const;
+    qint64 timestamp() const;
 
     QVariant getData(const QString &id) const override;
     void setData(const QString &id, const QVariant &data) override;
@@ -68,7 +68,7 @@ private:
     void updateTimestamp();
 
     const QString m_sid;
-    uint m_timestamp;
+    qint64 m_timestamp;
     QVariantHash m_data;
 };