diff --git a/packages/server/src/cli.ts b/packages/server/src/cli.ts
index e57a6af0..89bb918e 100644
--- a/packages/server/src/cli.ts
+++ b/packages/server/src/cli.ts
@@ -25,7 +25,7 @@ commander.version(process.env.VERSION || "development")
 	.option("--data-dir <value>", "DEPRECATED: Use '--user-data-dir' instead. Customize where user-data is stored.")
 	.option("-h, --host <value>", "Customize the hostname.", "0.0.0.0")
 	.option("-o, --open", "Open in the browser on startup.", false)
-	.option("-p, --port <number>", "Port to bind on.", parseInt(process.env.PORT, 10) || 8443)
+	.option("-p, --port <number>", "Port to bind on.", parseInt(process.env.PORT!, 10) || 8443)
 	.option("-N, --no-auth", "Start without requiring authentication.", undefined)
 	.option("-H, --allow-http", "Allow http connections.", false)
 	.option("-P, --password <value>", "Specify a password for authentication.")
diff --git a/scripts/vscode.patch b/scripts/vscode.patch
index f6d78c1a..bc6cae6a 100644
--- a/scripts/vscode.patch
+++ b/scripts/vscode.patch
@@ -98,6 +98,14 @@ index f68ae90..d6b9ea7 100644
 @@ -24 +24 @@ import { disposableTimeout } from 'vs/base/common/async';
 -import { isMacintosh } from 'vs/base/common/platform';
 +import { isMacintosh } from 'vs/base/browser/browser';
+diff --git a/src/vs/base/node/config.ts b/src/vs/base/node/config.ts
+index 5ef2193..a232b6c 100644
+--- a/src/vs/base/node/config.ts
++++ b/src/vs/base/node/config.ts
+@@ -79,0 +80,3 @@ export class ConfigWatcher<T> implements IConfigWatcher<T>, IDisposable {
++			} else {
++				this.cache = config; // update config
++				this._onDidUpdateConfiguration.fire({ config });
 diff --git a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts b/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
 index 74148e4..041205b 100644
 --- a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts