diff --git a/src/drivers/npm/index.js b/src/drivers/npm/index.js
index 46640915a..cdff2ba3d 100755
--- a/src/drivers/npm/index.js
+++ b/src/drivers/npm/index.js
@@ -32,10 +32,6 @@ do {
 
 const wappalyzer = new Wappalyzer(url, options);
 
-wappalyzer.log = (message) => {
-  process.stdout.write('xx');
-};
-
 wappalyzer.analyze()
   .then((json) => {
     process.stdout.write(`${JSON.stringify(json)}\n`);
diff --git a/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js
index 6f339da05..f698fba57 100644
--- a/src/drivers/webextension/js/driver.js
+++ b/src/drivers/webextension/js/driver.js
@@ -25,20 +25,18 @@ browser.tabs.onRemoved.addListener((tabId) => {
  * Get a value from localStorage
  */
 function getOption(name, defaultValue = null) {
-  return new Promise((resolve, reject) => {
-    const callback = (item) => {
-      options[name] = item[name] ? item[name] : defaultValue;
+  return new Promise(async (resolve) => {
+    let option = defaultValue;
 
-      resolve(options[name]);
-    };
+    try {
+      option = await browser.storage.local.get(name);
+    } catch (error) {
+      wappalyzer.log(error, 'driver', 'error');
+    }
 
-    browser.storage.local.get(name)
-      .then(callback)
-      .catch((error) => {
-        wappalyzer.log(error, 'driver', 'error');
+    options[name] = option;
 
-        reject();
-      });
+    resolve(option);
   });
 }
 
diff --git a/src/drivers/webextension/js/options.js b/src/drivers/webextension/js/options.js
index 935d11318..2282498df 100644
--- a/src/drivers/webextension/js/options.js
+++ b/src/drivers/webextension/js/options.js
@@ -1,5 +1,7 @@
 /** global: browser */
 /** global: Wappalyzer */
+/* globals browser chrome Wappalyzer */
+/* eslint-env browser */
 
 const wappalyzer = new Wappalyzer();
 
@@ -26,15 +28,15 @@ document.addEventListener('DOMContentLoaded', () => {
   });
 
   document.querySelector('#github').addEventListener('click', () => {
-    open(wappalyzer.config.githubURL);
+    window.open(wappalyzer.config.githubURL);
   });
 
   document.querySelector('#twitter').addEventListener('click', () => {
-    open(wappalyzer.config.twitterURL);
+    window.open(wappalyzer.config.twitterURL);
   });
 
   document.querySelector('#wappalyzer').addEventListener('click', () => {
-    open(wappalyzer.config.websiteURL);
+    window.open(wappalyzer.config.websiteURL);
   });
 
   getOption('upgradeMessage', true, (value) => {