diff --git a/src/ext/lib/comms/CommsServer.js b/src/ext/lib/comms/CommsServer.js
index 72c8067..e2d8b56 100644
--- a/src/ext/lib/comms/CommsServer.js
+++ b/src/ext/lib/comms/CommsServer.js
@@ -13,7 +13,7 @@ class CommsServer {
       browser.runtime.onConnect.addListener(p => this.onConnect(p));
       browser.runtime.onMessage.addListener((m, sender) => this.processReceivedMessage_nonpersistent(m, sender));
     } else {
-      chrome.runtime.onConnect.addListener(p => ths.onConnect(p));
+      chrome.runtime.onConnect.addListener(p => this.onConnect(p));
       chrome.runtime.onMessage.addListener((m, sender, callback) => this.processReceivedMessage_nonpersistent(m, sender, callback));
     }
 
diff --git a/src/ext/uw-bg.js b/src/ext/uw-bg.js
index 22a493f..767e8f5 100644
--- a/src/ext/uw-bg.js
+++ b/src/ext/uw-bg.js
@@ -66,11 +66,10 @@ class UWServer {
     this.comms.subscribe('uwui-vue-initialized', () => this.uiLoggerInitialized = true);
 
 
-    var ths = this;
     if(BrowserDetect.firefox) {
-      browser.tabs.onActivated.addListener(function(m) {ths.onTabSwitched(m)});  
+      browser.tabs.onActivated.addListener(function(m) {this.onTabSwitched(m)});  
     } else if (BrowserDetect.chrome) {
-      chrome.tabs.onActivated.addListener(function(m) {ths.onTabSwitched(m)});
+      chrome.tabs.onActivated.addListener(function(m) {this.onTabSwitched(m)});
     }
   }
 
diff --git a/src/popup/panels/VideoPanel.vue b/src/popup/panels/VideoPanel.vue
index a75d401..ae9a741 100644
--- a/src/popup/panels/VideoPanel.vue
+++ b/src/popup/panels/VideoPanel.vue
@@ -157,7 +157,7 @@ export default {
   },
   methods: {
     async openOptionsPage() {
-      browser.runtime.openOptionsPage();
+      (browser ?? chrome).runtime.openOptionsPage();
     },
     execAction(action) {
       this.exec.exec(action, 'page', this.frame);