diff --git a/public/app/core/filters/filters.ts b/public/app/core/filters/filters.ts
index 67a3fa655f8..d6f32bdf272 100644
--- a/public/app/core/filters/filters.ts
+++ b/public/app/core/filters/filters.ts
@@ -1,4 +1,5 @@
 ///<reference path="../../headers/common.d.ts" />
+'use strict';
 
 import angular = require('angular');
 import jquery = require('jquery');
@@ -59,8 +60,8 @@ module.filter('noXml', function() {
   };
 });
 
-module.filter('interpolateTemplateVars', function(templateSrv) {
-  var interpolateTemplateVars : any = function (text, scope) {
+module.filter('interpolateTemplateVars', function (templateSrv) {
+  var filterFunc : any = function (text, scope) {
     if (scope.panel) {
       return templateSrv.replaceWithText(text, scope.panel.scopedVars);
     } else {
@@ -68,10 +69,8 @@ module.filter('interpolateTemplateVars', function(templateSrv) {
     }
   };
 
-  interpolateTemplateVars.$stateful = true;
-
-  return interpolateTemplateVars;
+  filterFunc.$stateful = true;
+  return filterFunc;
 });
 
-// dummy export
 export {};
diff --git a/tasks/options/ngAnnotate.js b/tasks/options/ngAnnotate.js
index 293023c1b5f..73dd9afe3e1 100644
--- a/tasks/options/ngAnnotate.js
+++ b/tasks/options/ngAnnotate.js
@@ -4,16 +4,7 @@ module.exports = function(config) {
       expand: true,
       cwd:'<%= genDir %>',
       src: [
-        'app/controllers/**/*.js',
-        'app/plugins/**/*.js',
-        'app/directives/**/*.js',
-        'app/services/**/*.js',
-        'app/filters/**/*.js',
-        'app/features/**/*.js',
-        'app/panels/**/*.js',
-        'app/routes/**/*.js',
-        'app/app.js',
-        'vendor/angular/**/*.js',
+        'app/**/*.js',
       ],
       dest: '<%= genDir %>'
     }
diff --git a/tasks/options/tslint.js b/tasks/options/tslint.js
index 4ffa53beecd..6d095752c45 100644
--- a/tasks/options/tslint.js
+++ b/tasks/options/tslint.js
@@ -14,7 +14,7 @@ module.exports = function(config) {
           "class-name": true,
           "interface-name": true,
           "semicolon": true,
-          "use-strict": [true, "check-module", "check-function" ],
+          "use-strict": [false, "check-module", "check-function"],
           "whitespace": [true, "check-branch", "check-decl", "check-type"],
         }
       }