diff --git a/src/gui/macutilities.mm b/src/gui/macutilities.mm
index 910d77368..60e71cef0 100644
--- a/src/gui/macutilities.mm
+++ b/src/gui/macutilities.mm
@@ -68,14 +68,14 @@ namespace MacUtils
 
         if (class_getInstanceMethod(delClass, shouldHandle))
         {
-            if (class_replaceMethod(delClass, shouldHandle, (IMP)dockClickHandler, "B@:"))
+            if (class_replaceMethod(delClass, shouldHandle, reinterpret_cast<IMP>(dockClickHandler), "B@:"))
                 qDebug("Registered dock click handler (replaced original method)");
             else
                 qWarning("Failed to replace method for dock click handler");
         }
         else
         {
-            if (class_addMethod(delClass, shouldHandle, (IMP)dockClickHandler, "B@:"))
+            if (class_addMethod(delClass, shouldHandle, reinterpret_cast<IMP>(dockClickHandler), "B@:"))
                 qDebug("Registered dock click handler");
             else
                 qWarning("Failed to register dock click handler");
diff --git a/src/gui/properties/trackerlistwidget.cpp b/src/gui/properties/trackerlistwidget.cpp
index a1d00af09..ba2b8a9b0 100644
--- a/src/gui/properties/trackerlistwidget.cpp
+++ b/src/gui/properties/trackerlistwidget.cpp
@@ -373,6 +373,7 @@ void TrackerListWidget::loadTrackers()
         {
             item = new QTreeWidgetItem();
             item->setText(COL_URL, trackerURL);
+            item->setToolTip(COL_URL, trackerURL);
             addTopLevelItem(item);
             m_trackerItems[trackerURL] = item;
         }
@@ -400,6 +401,7 @@ void TrackerListWidget::loadTrackers()
         }
 
         item->setText(COL_MSG, entry.message);
+        item->setToolTip(COL_MSG, entry.message);
         item->setText(COL_PEERS, ((entry.numPeers > -1)
             ? QString::number(entry.numPeers)
             : tr("N/A")));
diff --git a/src/webui/www/private/scripts/dynamicTable.js b/src/webui/www/private/scripts/dynamicTable.js
index 98e220f18..37519058e 100644
--- a/src/webui/www/private/scripts/dynamicTable.js
+++ b/src/webui/www/private/scripts/dynamicTable.js
@@ -621,16 +621,16 @@ window.qBittorrent.DynamicTable = (function() {
             let row;
 
             if (!this.rows.has(rowId)) {
-                row = {};
+                row = {
+                    'full_data': {},
+                    'rowId': rowId
+                };
                 this.rows.set(rowId, row);
-                row['full_data'] = {};
-                row['rowId'] = rowId;
             }
             else
                 row = this.rows.get(rowId);
 
             row['data'] = data;
-
             for (const x in data)
                 row['full_data'][x] = data[x];
         },