diff --git a/extensions/typescript-language-features/extension-browser.webpack.config.js b/extensions/typescript-language-features/extension-browser.webpack.config.js
new file mode 100644
index 00000000000..d5cf063cd26
--- /dev/null
+++ b/extensions/typescript-language-features/extension-browser.webpack.config.js
@@ -0,0 +1,18 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withBrowserDefaults = require('../shared.webpack.config').browser;
+
+module.exports = withBrowserDefaults({
+	context: __dirname,
+	entry: {
+		extension: './src/extension.browser.ts',
+		'tsserver.browser': './src/tsserver.browser.ts',
+	}
+});
diff --git a/extensions/typescript-language-features/src/features/organizeImports.ts b/extensions/typescript-language-features/src/features/organizeImports.ts
index 80175554c9e..6a3747cbd55 100644
--- a/extensions/typescript-language-features/src/features/organizeImports.ts
+++ b/extensions/typescript-language-features/src/features/organizeImports.ts
@@ -107,7 +107,8 @@ export function register(
 	telemetryReporter: TelemetryReporter,
 ) {
 	return conditionalRegistration([
-		requireMinVersion(client, OrganizeImportsCodeActionProvider.minVersion)
+		requireMinVersion(client, OrganizeImportsCodeActionProvider.minVersion),
+
 	], () => {
 		const organizeImportsProvider = new OrganizeImportsCodeActionProvider(client, commandManager, fileConfigurationManager, telemetryReporter);
 		return vscode.languages.registerCodeActionsProvider(selector.syntax,
diff --git a/src/vs/platform/webview/electron-main/webviewProtocolProvider.ts b/src/vs/platform/webview/electron-main/webviewProtocolProvider.ts
index 36051ae9d7f..7c158fa3895 100644
--- a/src/vs/platform/webview/electron-main/webviewProtocolProvider.ts
+++ b/src/vs/platform/webview/electron-main/webviewProtocolProvider.ts
@@ -174,7 +174,7 @@ export class WebviewProtocolProvider extends Disposable {
 
 				const fileService = {
 					readFileStream: async (resource: URI): Promise<VSBufferReadableStream> => {
-						if (uri.scheme === Schemas.file) {
+						if (resource.scheme === Schemas.file) {
 							return (await this.fileService.readFileStream(resource)).value;
 						}