diff --git a/js/trdom_torrentcontrol.js b/js/trdom_torrentcontrol.js
index 244bfb3..9e3f8e8 100644
--- a/js/trdom_torrentcontrol.js
+++ b/js/trdom_torrentcontrol.js
@@ -19,7 +19,7 @@ class trdom_torrentcontrol {
     //TODO: remove
     #getKnownTorrents;
 
-    #handler(e) {
+    #handler = function(e) {
         switch (e.type) {
         case 'click':
             if (e.currentTarget.hasAttributeNS('trweb', 'torrentlistfield')) {
@@ -55,7 +55,7 @@ class trdom_torrentcontrol {
                 }
             }
         }
-    }
+    }.bind(this);
 
     constructor(hash, server, logcb, getKnownTorrents) {
         this.#hash = hash;
@@ -81,7 +81,7 @@ class trdom_torrentcontrol {
         element_start.setAttributeNS('trweb', 'torrent', this.#hash);
         element_start.setAttributeNS('trweb', 'torrentlistfield', 'start');
         element_start.appendChild(document.createTextNode("Start"));
-        element_start.addEventListener("click", this.#handler.bind(this));
+        element_start.addEventListener("click", this.#handler);
 
         let element_pause = document.createElement('div');
         element_pause.classList.add('trweb_torrentlistcontrol', 'col-4');
@@ -89,7 +89,7 @@ class trdom_torrentcontrol {
         element_pause.setAttributeNS('trweb', 'torrent', this.#hash);
         element_pause.setAttributeNS('trweb', 'torrentlistfield', 'pause');
         element_pause.appendChild(document.createTextNode("Pause"));
-        element_pause.addEventListener("click", this.#handler.bind(this));
+        element_pause.addEventListener("click", this.#handler);
 
         // Download by magnet
         let element_magnet = document.createElement('div');
@@ -98,7 +98,7 @@ class trdom_torrentcontrol {
         element_magnet.setAttributeNS('trweb', 'torrent', this.#hash);
         element_magnet.setAttributeNS('trweb', 'torrentlistfield', 'magnet');
         element_magnet.appendChild(document.createTextNode(`[${srv}] Magnet`));
-        element_magnet.addEventListener("click", this.#handler.bind(this));
+        element_magnet.addEventListener("click", this.#handler);
 
         // Download by torrent file
         let element_download = document.createElement('div');
@@ -107,7 +107,7 @@ class trdom_torrentcontrol {
         element_download.setAttributeNS('trweb', 'torrent', this.#hash);
         element_download.setAttributeNS('trweb', 'torrentlistfield', 'download');
         element_download.appendChild(document.createTextNode(`[${srv}] Get torrent`));
-        element_download.addEventListener("click", this.#handler.bind(this));
+        element_download.addEventListener("click", this.#handler);
 
         // row container
         let element_serverrow = document.createElement('div');
diff --git a/js/trtorrent.js b/js/trtorrent.js
index 2e1cb9b..41a3036 100644
--- a/js/trtorrent.js
+++ b/js/trtorrent.js
@@ -26,7 +26,7 @@ class trtorrent {
         this.#servers[srv] = status;
     }
 
-    #handler(e) {
+    #handler = function(e) {
         switch (e.type) {
         case 'click':
             if (e.currentTarget.hasAttributeNS('trweb', 'torrentlistfield')) {
@@ -39,7 +39,7 @@ class trtorrent {
             }
             break;
         }
-    }
+    }.bind(this);
 
     constructor(hash) {
         this.#hash = hash;
@@ -52,7 +52,7 @@ class trtorrent {
         this.#element.torrent = this;
         this.#element.classList.add('trweb_torrentlistentry', 'trweb_hide_buttons', 'row');
         this.#element.setAttributeNS('trweb', 'torrentlistfield', 'entry');
-        this.#element.addEventListener('click', this.#handler.bind(this));
+        this.#element.addEventListener('click', this.#handler);
         this.#element.element_name = element_name;
         this.#element.appendChild(element_name);
     }
diff --git a/js/trweb.js b/js/trweb.js
index 82f5253..102c98b 100644
--- a/js/trweb.js
+++ b/js/trweb.js
@@ -8,7 +8,7 @@ class trweb {
     #loadcb = function(key) {return localStorage.getItem(`trweb.${key}`)};
     #savecb = function(key, value) {localStorage.setItem(`trweb.${key}`, value)};
     #logger = function(msg) {};
-    #logcb = function(module, loglevel, msg) {this.#logger(`${module}: ${msg}`)};
+    #logcb = function(module, loglevel, msg) {this.#logger(`${module}: ${msg}`)}.bind(this);
 
     #timer;
 
@@ -30,7 +30,7 @@ class trweb {
             this.#logger = logger;
         }
 
-        this.#dom_servermanager = new trdom_servermanager(this.#loadcb, this.#savecb, this.#logcb.bind(this), this.#registerServer.bind(this))
+        this.#dom_servermanager = new trdom_servermanager(this.#loadcb, this.#savecb, this.#logcb, this.#registerServer)
 
         this.#guiFooter = document.createElement('div');
         this.#guiFooter.classList.add('trweb_footer');
@@ -41,11 +41,11 @@ class trweb {
         }
         else {
             this.#logger('Waiting for document to load');
-            document.addEventListener('DOMContentLoaded', this.#handler.bind(this));
+            document.addEventListener('DOMContentLoaded', this.#handler);
         }
     }
 
-    #registerServer(name, initdata) {
+    #registerServer = function(name, initdata) {
         let torrentCallback = function(hash, torrentInfo) {
             let mergedTorrentInfo = this.#knownTorrents[hash];
             if (mergedTorrentInfo == null) {
@@ -55,11 +55,11 @@ class trweb {
             mergedTorrentInfo.name = torrentInfo.name;
 
             this.#updateTorrentDisplay(mergedTorrentInfo);
-        };
-        let newserver = new trserver(initdata, function(msg) {this.#logger(`[Server: ${name}]: ${msg}`);}.bind(this), torrentCallback.bind(this));
+        }.bind(this);
+        let newserver = new trserver(initdata, function(msg) {this.#logger(`[Server: ${name}]: ${msg}`);}.bind(this), torrentCallback);
         this.#dom_servermanager.getServers()[name] = newserver;
         newserver.refreshTorrentList();
-    }
+    }.bind(this);
 
     #createTorrentEntry(hash) {
         let torrent = new trtorrent(hash);
@@ -79,7 +79,7 @@ class trweb {
 
     #createServerEntryForTorrent(hash, srv) {
         this.#needsSort = true;
-        let control = new trdom_torrentcontrol(hash, this.#dom_servermanager.getServers()[srv], this.#logcb.bind(this), function() {return this.#knownTorrents}.bind(this));
+        let control = new trdom_torrentcontrol(hash, this.#dom_servermanager.getServers()[srv], this.#logcb, function() {return this.#knownTorrents}.bind(this));
 
         let torrent = this.#knownTorrents[hash];
 
@@ -162,7 +162,7 @@ class trweb {
         }
     }
 
-    #handler(e) {
+    #handler = function(e) {
         switch (e.type) {
             case 'DOMContentLoaded':
                 this.#logger('Activating TRWEB instance');
@@ -178,7 +178,7 @@ class trweb {
                 this.setTimer();
                 break;
         }
-    }
+    }.bind(this);
 
     refresh() {
         for (const [key, value] of Object.entries(this.#dom_servermanager.getServers())) {
@@ -197,16 +197,16 @@ class trweb {
         return list;
     }
 
-    #timercb() {
+    #timercb = function() {
         if (this.#needsSort) {
             this.#needsSort = false;
             this.sort();
         }
         this.refresh();
-    }
+    }.bind(this);
 
     setTimer() {
-        this.#timer = window.setInterval(this.#timercb.bind(this), 2000);
+        this.#timer = window.setInterval(this.#timercb, 2000);
     }
 
     haltTimer() {