diff --git a/package.json b/package.json
index a10ab16fd6c..05599868fb9 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,6 @@
     "url": "http://github.com/grafana/grafana.git"
   },
   "devDependencies": {
-    "@types/rx": "^2.5.34",
     "autoprefixer": "^6.4.0",
     "es6-promise": "^3.0.2",
     "es6-shim": "^0.35.1",
@@ -51,7 +50,7 @@
     "mocha": "3.2.0",
     "phantomjs-prebuilt": "^2.1.13",
     "reflect-metadata": "0.1.8",
-    "rxjs": "5.0.0-rc.5",
+    "rxjs": "^5.0.0-rc.5",
     "sass-lint": "^1.10.2",
     "systemjs": "0.19.41",
     "zone.js": "^0.7.2"
diff --git a/tasks/options/exec.js b/tasks/options/exec.js
index 1e40f4dc870..9e74083623c 100644
--- a/tasks/options/exec.js
+++ b/tasks/options/exec.js
@@ -1,7 +1,7 @@
 module.exports = function(config) {
   'use strict'
   return {
-    tslint : "node ./node_modules/tslint/lib/tslint-cli.js -c tslint.json --project ./tsconfig.json --type-check",
+    tslint : "node ./node_modules/tslint/lib/tslint-cli.js -c tslint.json --project ./tsconfig.json",
     tscompile: "node ./node_modules/typescript/lib/tsc.js -p tsconfig.json" 
   };
 };
diff --git a/tsconfig.json b/tsconfig.json
index 27b03c40003..8595b1efcd0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,7 +14,8 @@
         "noImplicitReturns":false,
         "noImplicitThis":false,
         "noImplicitUseStrict":false,
-        "noUnusedLocals":false
+        "noUnusedLocals":false,
+        "moduleResolution": "classic"
     },
     "include": [
         "public/app/**/*.ts"