diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index c00e1b3cd7620..6c0cdf0017210 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -156,9 +156,8 @@ namespace ts.server {
             "exclude": [["^", 1, "/.*"]],                     // Exclude that whole folder if the file indicated above is found in it
             "types": ["office"]                               // @types package to fetch instead
         },
-        "Minified files": {
-            // e.g. /whatever/blah.min.js
-            "match": /^(.+\.min\.js)$/i,
+        "References": {
+            "match": /^(.*\/_references\.js)$/i,
             "exclude": [["^", 1, "$"]]
         }
     };
@@ -1881,7 +1880,13 @@ namespace ts.server {
                         }
                     }
                     if (!exclude) {
-                        filesToKeep.push(proj.rootFiles[i]);
+                        // Exclude any minified files that get this far
+                        if (/^.+[\.-]min\.js$/.test(normalizedNames[i])) {
+                            excludedFiles.push(normalizedNames[i]);
+                        }
+                        else {
+                            filesToKeep.push(proj.rootFiles[i]);
+                        }
                     }
                 }
             }
diff --git a/src/server/typesMap.json b/src/server/typesMap.json
index 5e7df046dbea0..93e9c2502f86f 100644
--- a/src/server/typesMap.json
+++ b/src/server/typesMap.json
@@ -10,7 +10,7 @@
             "types": ["winjs"]
         },
         "Kendo": {
-            "match": "^(.*\\/kendo)\\/kendo\\.all\\.min\\.js$",
+            "match": "^(.*\\/kendo(-ui)?)\\/kendo\\.all(\\.min)?\\.js$",
             "exclude": [["^", 1, "/.*"]],
             "types": ["kendo-ui"]
         },
@@ -19,8 +19,8 @@
             "exclude": [["^", 1, "/.*"]],
             "types": ["office"]
         },
-        "Minified files": {
-            "match": "^(.+\\.min\\.js)$",
+        "References": {
+            "match": "^(.*\\/_references\\.js)$",
             "exclude": [["^", 1, "$"]]
         }
     },