diff --git a/package.json b/package.json
index b1cc9d5e56..d141ff2c7d 100644
--- a/package.json
+++ b/package.json
@@ -143,10 +143,11 @@
     "remix-ide": "./bin/remix-ide"
   },
   "scripts": {
-    "setupremix": "npm run linkremixdebug && npm run linkremixlib && npm run linkremixsolidity && npm run linkremixanalyzer && npm run linkremixtests",
+    "setupremix": "npm run linkremixdebug && npm run linkremixlib && npm run linkremixsolidity && npm run linkremixanalyzer && npm run linkremixtests && npm run linkremixsimulator",
     "pullremix": "git clone https://github.com/ethereum/remix",
     "linkremixlib": "cd node_modules && rm -rf remix-lib && ln -s ../../remix/remix-lib remix-lib && cd ..",
     "linkremixsolidity": "cd node_modules && rm -rf remix-solidity && ln -s ../../remix/remix-solidity remix-solidity && cd ..",
+    "linkremixsimulator": "cd node_modules && rm -rf remix-simulator && ln -s ../../remix/remix-simulator remix-simulator && cd ..",
     "linkremixtests": "cd node_modules && rm -rf remix-tests && ln -s ../../remix/remix-tests remix-tests && cd ..",
     "linkremixdebug": "cd node_modules && rm -rf remix-debug && ln -s ../../remix/remix-debug remix-debug && cd ..",
     "linkremixanalyzer": "cd node_modules && rm -rf remix-analyzer && ln -s ../../remix/remix-analyzer remix-analyzer && cd ..",
diff --git a/src/app/panels/main-view.js b/src/app/panels/main-view.js
index 6d8f1bde65..6153c0557c 100644
--- a/src/app/panels/main-view.js
+++ b/src/app/panels/main-view.js
@@ -1,6 +1,8 @@
 var yo = require('yo-yo')
 var EventManager = require('../../lib/events')
 
+var executionContext = require('../../execution-context')
+
 var Terminal = require('./terminal')
 var globalRegistry = require('../../global/registry')
 var { TabProxy } = require('./tab-proxy.js')
diff --git a/src/app/tabs/debugger-tab.js b/src/app/tabs/debugger-tab.js
index d86db9aef5..58f5d6b554 100644
--- a/src/app/tabs/debugger-tab.js
+++ b/src/app/tabs/debugger-tab.js
@@ -2,6 +2,7 @@ var yo = require('yo-yo')
 var css = require('./styles/debugger-tab-styles')
 
 var DebuggerUI = require('./debugger/debuggerUI')
+var executionContext = require('../../execution-context')
 
 import { ViewPlugin } from '@remixproject/engine'
 import * as packageJson from '../../../package.json'