diff --git a/addon/ng2/models/webpack-build-common.ts b/addon/ng2/models/webpack-build-common.ts
index d4291f118851..80916804de23 100644
--- a/addon/ng2/models/webpack-build-common.ts
+++ b/addon/ng2/models/webpack-build-common.ts
@@ -36,6 +36,7 @@ export function getWebpackCommonConfig(
   return {
     devtool: 'source-map',
     resolve: {
+      mainFields: ['browser', 'main'],
       extensions: ['', '.ts', '.js'],
       root: appRoot
     },
diff --git a/package.json b/package.json
index 720438199e80..a06153e6d9c0 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "@angular/core": "^2.0.0-rc.6",
     "@angular/tsc-wrapped": "^0.2.2",
     "angular2-template-loader": "^0.5.0",
-    "awesome-typescript-loader": "^2.2.3",
+    "awesome-typescript-loader": "2.2.1",
     "chalk": "^1.1.3",
     "common-tags": "^1.3.1",
     "compression-webpack-plugin": "^0.3.1",
@@ -101,9 +101,9 @@
     "ts-loader": "^0.8.2",
     "tslint-loader": "^2.1.4",
     "typedoc": "^0.4.2",
-    "typescript": "2.0.2",
+    "typescript": "2.0.0",
     "url-loader": "^0.5.7",
-    "webpack": "2.1.0-beta.19",
+    "webpack": "2.1.0-beta.21",
     "webpack-dev-server": "^2.1.0-beta.3",
     "webpack-md5-hash": "0.0.5",
     "webpack-merge": "^0.14.0"