diff --git a/vscode-extensions/commons/commons-language-server/.settings/org.eclipse.core.resources.prefs b/vscode-extensions/commons/commons-language-server/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..e9441bb12
--- /dev/null
+++ b/vscode-extensions/commons/commons-language-server/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding/<project>=UTF-8
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java
index 4c7e8d213..3d6ecd561 100644
--- a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java
+++ b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java
@@ -65,7 +65,7 @@ public class VscodeCompletionEngineAdapter implements VscodeCompletionEngine {
 
 	private Mono<CompletionList> getCompletionsMono(TextDocumentPositionParams params) {
 		SimpleTextDocumentService documents = server.getTextDocumentService();
-		TextDocument doc = documents.get(params);
+		TextDocument doc = documents.get(params).copy();
 		if (doc!=null) {
 			return Mono.fromCallable(() -> {
 				//TODO: This callable is a 'big lump of work' so can't be canceled in pieces.
diff --git a/vscode-extensions/commons/commons-maven/.settings/org.eclipse.core.resources.prefs b/vscode-extensions/commons/commons-maven/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..cdfe4f1b6
--- /dev/null
+++ b/vscode-extensions/commons/commons-maven/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/vscode-extensions/commons/java-properties/.settings/org.eclipse.core.resources.prefs b/vscode-extensions/commons/java-properties/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..f9fe34593
--- /dev/null
+++ b/vscode-extensions/commons/java-properties/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
+encoding/<project>=UTF-8
diff --git a/vscode-extensions/commons/language-server-test-harness/.settings/org.eclipse.core.resources.prefs b/vscode-extensions/commons/language-server-test-harness/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..f9fe34593
--- /dev/null
+++ b/vscode-extensions/commons/language-server-test-harness/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
+encoding/<project>=UTF-8
diff --git a/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java b/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java
index a81fd45b4..5c3ef5415 100644
--- a/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java
+++ b/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java
@@ -173,8 +173,6 @@ public class LanguageServerHarness {
 	public TextDocumentInfo openDocument(TextDocumentInfo documentInfo) throws Exception {
 		DidOpenTextDocumentParams didOpen = new DidOpenTextDocumentParams();
 		didOpen.setTextDocument(documentInfo.getDocument());
-		didOpen.setText(documentInfo.getText());
-		didOpen.setUri(documentInfo.getUri());
 		if (server!=null) {
 			server.getTextDocumentService().didOpen(didOpen);
 		}
diff --git a/vscode-extensions/vscode-manifest-yaml/lib/Main.ts b/vscode-extensions/vscode-manifest-yaml/lib/Main.ts
index 2a986d353..47e3b2e9e 100644
--- a/vscode-extensions/vscode-manifest-yaml/lib/Main.ts
+++ b/vscode-extensions/vscode-manifest-yaml/lib/Main.ts
@@ -11,13 +11,6 @@ import * as ChildProcess from 'child_process';
 import {LanguageClient, LanguageClientOptions, SettingMonitor, ServerOptions, StreamInfo} from 'vscode-languageclient';
 import {TextDocument, OutputChannel} from 'vscode';
 
-const DEBUG_ARG = '-agentlib:jdwp=transport=dt_socket,server=y,address=8000,suspend=y';
-    //If DEBUG is falsy then
-    //   we launch from the 'fat jar' (which has to be built by running mvn package)
-    //if DEBUG is truthy then
-    //   - we launch the Java project directly from the classes folder produced by Eclipse JDT compiler
-    //   - we add DEBUG_ARG to the launch so that remote debugger can attach on port 8000
-
 var log_output : OutputChannel = null;
 
 function log(msg : string) {