diff --git a/extensions/html/server/npm-shrinkwrap.json b/extensions/html/server/npm-shrinkwrap.json
index 598012b6d8b..d1d848b7008 100644
--- a/extensions/html/server/npm-shrinkwrap.json
+++ b/extensions/html/server/npm-shrinkwrap.json
@@ -2,40 +2,45 @@
   "name": "vscode-html-languageserver",
   "version": "1.0.0",
   "dependencies": {
+    "@types/mocha": {
+      "version": "2.2.37",
+      "from": "@types/mocha@>=2.2.33 <3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.37.tgz"
+    },
     "@types/node": {
       "version": "6.0.58",
       "from": "@types/node@>=6.0.51 <7.0.0",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.58.tgz"
     },
     "vscode-css-languageservice": {
-      "version": "2.0.0-next.6",
+      "version": "2.0.0-next.7",
       "from": "vscode-css-languageservice@next",
-      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-2.0.0-next.6.tgz"
+      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-2.0.0-next.7.tgz"
     },
     "vscode-html-languageservice": {
-      "version": "2.0.0-next.5",
+      "version": "2.0.0-next.6",
       "from": "vscode-html-languageservice@next",
-      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-2.0.0-next.5.tgz"
+      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-2.0.0-next.6.tgz"
     },
     "vscode-jsonrpc": {
-      "version": "3.0.1-alpha.2",
-      "from": "vscode-jsonrpc@>=3.0.1-alpha.2 <4.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.0.1-alpha.2.tgz"
+      "version": "3.0.2-beta.5",
+      "from": "vscode-jsonrpc@>=3.0.2-beta.5 <4.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.0.2-beta.5.tgz"
     },
     "vscode-languageserver": {
-      "version": "3.0.1-alpha.2",
+      "version": "3.0.2-beta.5",
       "from": "vscode-languageserver@next",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.0.1-alpha.2.tgz"
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.0.2-beta.5.tgz"
     },
     "vscode-languageserver-types": {
-      "version": "3.0.1-alpha.2",
-      "from": "vscode-languageserver-types@>=3.0.1-alpha.2 <4.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.0.1-alpha.2.tgz"
+      "version": "3.0.2-beta.5",
+      "from": "vscode-languageserver-types@>=3.0.2-beta.5 <4.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.0.2-beta.5.tgz"
     },
     "vscode-nls": {
-      "version": "1.0.7",
-      "from": "vscode-nls@>=1.0.4 <2.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-1.0.7.tgz"
+      "version": "2.0.1",
+      "from": "vscode-nls@>=2.0.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.1.tgz"
     },
     "vscode-uri": {
       "version": "1.0.0",
diff --git a/extensions/html/server/package.json b/extensions/html/server/package.json
index fc6d4a05e98..1a5e6c0e815 100644
--- a/extensions/html/server/package.json
+++ b/extensions/html/server/package.json
@@ -8,10 +8,10 @@
     "node": "*"
   },
   "dependencies": {
-    "vscode-css-languageservice": "^2.0.0-next.6",
-    "vscode-html-languageservice": "^2.0.0-next.5",
-    "vscode-languageserver": "3.0.1-alpha.2",
-    "vscode-nls": "^1.0.7",
+    "vscode-css-languageservice": "^2.0.0-next.7",
+    "vscode-html-languageservice": "^2.0.0-next.6",
+    "vscode-languageserver": "^3.0.2-beta.5",
+    "vscode-nls": "^2.0.1",
     "vscode-uri": "^1.0.0"
   },
   "devDependencies": {
diff --git a/extensions/html/server/src/htmlServerMain.ts b/extensions/html/server/src/htmlServerMain.ts
index a9ab66a1391..374ba87703d 100644
--- a/extensions/html/server/src/htmlServerMain.ts
+++ b/extensions/html/server/src/htmlServerMain.ts
@@ -19,7 +19,7 @@ import * as nls from 'vscode-nls';
 nls.config(process.env['VSCODE_NLS_CONFIG']);
 
 namespace ColorSymbolRequest {
-	export const type: RequestType<string, Range[], any, any> = { get method() { return 'css/colorSymbols'; }, _: null };
+	export const type: RequestType<string, Range[], any, any> = new RequestType('css/colorSymbols');
 }
 
 // Create a connection for the server
diff --git a/extensions/html/server/src/modes/javascriptMode.ts b/extensions/html/server/src/modes/javascriptMode.ts
index 54811dddfe0..71f651cb121 100644
--- a/extensions/html/server/src/modes/javascriptMode.ts
+++ b/extensions/html/server/src/modes/javascriptMode.ts
@@ -67,7 +67,7 @@ export function getJavascriptMode(documentRegions: LanguageModelCache<HTMLDocume
 			return diagnostics.map(diag => {
 				return {
 					range: convertRange(currentTextDocument, diag),
-					severity: DiagnosticSeverity.Error,
+					severity: <DiagnosticSeverity>DiagnosticSeverity.Error,
 					message: ts.flattenDiagnosticMessageText(diag.messageText, '\n')
 				};
 			});
@@ -165,7 +165,7 @@ export function getJavascriptMode(documentRegions: LanguageModelCache<HTMLDocume
 				return occurrences.map(entry => {
 					return {
 						range: convertRange(currentTextDocument, entry.textSpan),
-						kind: entry.isWriteAccess ? DocumentHighlightKind.Write : DocumentHighlightKind.Text
+						kind: <DocumentHighlightKind>(entry.isWriteAccess ? DocumentHighlightKind.Write : DocumentHighlightKind.Text)
 					};
 				});
 			};