diff --git a/libs/remix-debug/src/index.ts b/libs/remix-debug/src/index.ts
index b3dde70345..50222e97cc 100644
--- a/libs/remix-debug/src/index.ts
+++ b/libs/remix-debug/src/index.ts
@@ -1,5 +1,5 @@
 'use strict'
-import init from './init'
+import * as init from './init'
 import { Ethdebugger as EthDebugger } from './Ethdebugger'
 import { Debugger as TransactionDebugger } from './debugger/debugger'
 import { CmdLine } from './cmdline'
diff --git a/libs/remix-debug/src/init.ts b/libs/remix-debug/src/init.ts
index 4252cd580d..eb343c33a5 100644
--- a/libs/remix-debug/src/init.ts
+++ b/libs/remix-debug/src/init.ts
@@ -1,75 +1,74 @@
 'use strict'
 import Web3 from 'web3'
 
-export = {
-  loadWeb3: function (url) {
-    if (!url) url = 'http://localhost:8545'
-    const web3 = new Web3()
-    web3.setProvider(new Web3.providers.HttpProvider(url))
-    this.extend(web3)
-    return web3
-  },
+export function loadWeb3 (url) {
+  if (!url) url = 'http://localhost:8545'
+  const web3 = new Web3()
+  web3.setProvider(new Web3.providers.HttpProvider(url))
+  extend(web3)
+  return web3
+}
 
-  extendWeb3: function (web3) {
-    this.extend(web3)
-  },
+export function extendWeb3 (web3) {
+  extend(web3)
+}
 
-  setProvider: function (web3, url) {
-    web3.setProvider(new web3.providers.HttpProvider(url))
-  },
+export function setProvider (web3, url) {
+  web3.setProvider(new web3.providers.HttpProvider(url))
+}
 
-  web3DebugNode: function (network) {
-    const web3DebugNodes = {
-      'Main': 'https://rpc.archivenode.io/e50zmkroshle2e2e50zm0044i7ao04ym',
-      'Rinkeby': 'https://remix-rinkeby.ethdevops.io',
-      'Ropsten': 'https://remix-ropsten.ethdevops.io',
-      'Goerli': 'https://remix-goerli.ethdevops.io',
-      'Kovan': 'https://remix-kovan.ethdevops.io'
-    }
-    if (web3DebugNodes[network]) {
-      return this.loadWeb3(web3DebugNodes[network])
-    }
-    return null
-  },
+export function web3DebugNode (network) {
+  const web3DebugNodes = {
+    'Main': 'https://rpc.archivenode.io/e50zmkroshle2e2e50zm0044i7ao04ym',
+    'Rinkeby': 'https://remix-rinkeby.ethdevops.io',
+    'Ropsten': 'https://remix-ropsten.ethdevops.io',
+    'Goerli': 'https://remix-goerli.ethdevops.io',
+    'Kovan': 'https://remix-kovan.ethdevops.io'
+  }
+  if (web3DebugNodes[network]) {
+    return loadWeb3(web3DebugNodes[network])
+  }
+  return null
+}
 
-  extend: function (web3) {
-    if (!web3.extend) {
-      return
-    }
-    // DEBUG
-    const methods = []
-    if (!(web3.debug && web3.debug.preimage)) {
-      methods.push(new web3.extend.Method({
-        name: 'preimage',
-        call: 'debug_preimage',
-        inputFormatter: [null],
-        params: 1
-      }))
-    }
+export function extend (web3) {
+  if (!web3.extend) {
+    return
+  }
+  // DEBUG
+  const methods = []
+  if (!(web3.debug && web3.debug.preimage)) {
+    methods.push(new web3.extend.Method({
+      name: 'preimage',
+      call: 'debug_preimage',
+      inputFormatter: [null],
+      params: 1
+    }))
+  }
 
-    if (!(web3.debug && web3.debug.traceTransaction)) {
-      methods.push(new web3.extend.Method({
-        name: 'traceTransaction',
-        call: 'debug_traceTransaction',
-        inputFormatter: [null, null],
-        params: 2
-      }))
-    }
+  if (!(web3.debug && web3.debug.traceTransaction)) {
+    methods.push(new web3.extend.Method({
+      name: 'traceTransaction',
+      call: 'debug_traceTransaction',
+      inputFormatter: [null, null],
+      params: 2
+    }))
+  }
 
-    if (!(web3.debug && web3.debug.storageRangeAt)) {
-      methods.push(new web3.extend.Method({
-        name: 'storageRangeAt',
-        call: 'debug_storageRangeAt',
-        inputFormatter: [null, null, null, null, null],
-        params: 5
-      }))
-    }
-    if (methods.length > 0) {
-      web3.extend({
-        property: 'debug',
-        methods: methods,
-        properties: []
-      })
-    }
+  if (!(web3.debug && web3.debug.storageRangeAt)) {
+    methods.push(new web3.extend.Method({
+      name: 'storageRangeAt',
+      call: 'debug_storageRangeAt',
+      inputFormatter: [null, null, null, null, null],
+      params: 5
+    }))
+  }
+  if (methods.length > 0) {
+    web3.extend({
+      property: 'debug',
+      methods: methods,
+      properties: []
+    })
   }
 }
+
diff --git a/libs/remix-debug/src/solidity-decoder/types/RefType.ts b/libs/remix-debug/src/solidity-decoder/types/RefType.ts
index 181ef5c675..2ef3c95963 100644
--- a/libs/remix-debug/src/solidity-decoder/types/RefType.ts
+++ b/libs/remix-debug/src/solidity-decoder/types/RefType.ts
@@ -32,7 +32,7 @@ export class RefType {
     }
     let offset = stack[stack.length - 1 - stackDepth]
     if (this.isInStorage()) {
-      offset = util.toBN(offset)
+      offset = toBN(offset)
       try {
         return await this.decodeFromStorage({ offset: 0, slot: offset }, storageResolver)
       } catch (e) {
diff --git a/libs/remix-debug/tsconfig.lib.json b/libs/remix-debug/tsconfig.lib.json
index f9a4f32495..86fd7c0596 100644
--- a/libs/remix-debug/tsconfig.lib.json
+++ b/libs/remix-debug/tsconfig.lib.json
@@ -10,7 +10,8 @@
     },
     "exclude": [
       "**/*.spec.js",
-      "test/"
+      "test/",
+      "test.ts"
     ],
     "include": ["**/*.ts"]
   }