diff --git a/ponyracer/.angular-cli.json b/ponyracer/.angular-cli.json
index 3cf066277..9d7bab7ec 100644
--- a/ponyracer/.angular-cli.json
+++ b/ponyracer/.angular-cli.json
@@ -55,6 +55,9 @@
   },
   "defaults": {
     "styleExt": "css",
+    "class": {
+      "spec": false
+    },
     "component": {}
   }
 }
diff --git a/ponyracer/package.json b/ponyracer/package.json
index 2d7922a9e..5f709e0ac 100644
--- a/ponyracer/package.json
+++ b/ponyracer/package.json
@@ -26,7 +26,7 @@
     "zone.js": "^0.8.14"
   },
   "devDependencies": {
-    "@angular/cli": "1.4.7",
+    "@angular/cli": "1.4.8",
     "@angular/compiler-cli": "^4.2.4",
     "@angular/language-service": "^4.2.4",
     "@types/jasmine": "~2.5.53",
diff --git a/ponyracer/src/polyfills.ts b/ponyracer/src/polyfills.ts
index 581aadfea..20d40751a 100644
--- a/ponyracer/src/polyfills.ts
+++ b/ponyracer/src/polyfills.ts
@@ -37,8 +37,12 @@
 /** IE10 and IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
+/** IE10 and IE11 requires the following for the Reflect API. */
+// import 'core-js/es6/reflect';
+
+
 /** Evergreen browsers require these. **/
-import 'core-js/es6/reflect';
+// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
 import 'core-js/es7/reflect';
 
 
diff --git a/ponyracer/tslint.json b/ponyracer/tslint.json
index b6e591b2b..c24dc293d 100644
--- a/ponyracer/tslint.json
+++ b/ponyracer/tslint.json
@@ -15,7 +15,8 @@
     "forin": true,
     "import-blacklist": [
       true,
-      "rxjs"
+      "rxjs",
+      "rxjs/Rx"
     ],
     "import-spacing": true,
     "indent": [