diff --git a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java
index 0e41a7872..0f618fd23 100644
--- a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java
+++ b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java
@@ -1001,7 +1001,7 @@ public class BoshEditorTest {
 		assertEquals(1, completions.size());
 		CompletionItem c = completions.get(0);
 		c = harness.resolveCompletionItem(c);
-		assertContains("Couldn't connect to bosh", c.getDocumentation());
+		assertContains("Couldn't connect to bosh", c.getDocumentation().getLeft());
 		System.out.println("label  = " + c.getLabel());
 		System.out.println("detail = " + c.getDetail());
 		System.out.println("doc    = " + c.getDocumentation());
@@ -1414,7 +1414,7 @@ public class BoshEditorTest {
 		);
 		CompletionItem completion = editor.assertCompletionLabels("TimeoutException").get(0);
 		completion = harness.resolveCompletionItem(completion);
-		assertContains("Reading cloud config timed out", completion.getDocumentation());
+		assertContains("Reading cloud config timed out", completion.getDocumentation().getLeft());
 	}
 
 	@Test public void reconcileNetworkName() throws Exception {
diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
index 265c43935..7514bc78c 100644
--- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
+++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
@@ -193,7 +193,7 @@ public class SimpleLanguageServer implements Sts4LanguageServer, LanguageClientA
 				Mono<Object> moveCursor = edit.cursorMovement==null
 						? Mono.just(new ApplyWorkspaceEditResponse(true))
 						: Mono.fromFuture(client.moveCursor(edit.cursorMovement));
-				return applyEdit.flatMap(r -> r.getApplied() ? moveCursor : Mono.just(new ApplyWorkspaceEditResponse(true)));
+				return applyEdit.flatMap(r -> r.isApplied() ? moveCursor : Mono.just(new ApplyWorkspaceEditResponse(true)));
 			})
 			.toFuture();
 		}
diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java
index f7e96b2ce..7fc3b1323 100644
--- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java
+++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java
@@ -25,6 +25,7 @@ import org.eclipse.lsp4j.CodeLensParams;
 import org.eclipse.lsp4j.Command;
 import org.eclipse.lsp4j.CompletionItem;
 import org.eclipse.lsp4j.CompletionList;
+import org.eclipse.lsp4j.CompletionParams;
 import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.DidChangeTextDocumentParams;
 import org.eclipse.lsp4j.DidCloseTextDocumentParams;
@@ -269,7 +270,7 @@ public class SimpleTextDocumentService implements TextDocumentService {
 	public final static List<DocumentHighlight> NO_HIGHLIGHTS = ImmutableList.of();
 
 	@Override
-	public CompletableFuture<Either<List<CompletionItem>, CompletionList>> completion(TextDocumentPositionParams position) {
+	public CompletableFuture<Either<List<CompletionItem>, CompletionList>> completion(CompletionParams position) {
 		CompletionHandler h = completionHandler;
 		if (h!=null) {
 			return completionHandler.handle(position)
diff --git a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
index 6cc4bf79e..656b2a725 100644
--- a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
+++ b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
@@ -653,7 +653,7 @@ public class Editor {
 			assertEquals(expectDetail, it.getDetail());
 		}
 		if (expectDocSnippet!=null) {
-			assertContains(expectDocSnippet, it.getDocumentation());
+			assertContains(expectDocSnippet, it.getDocumentation().getLeft());
 		}
 		return it;
 	}
diff --git a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java
index 2e7f2dddb..6ab4e3a36 100644
--- a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java
+++ b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java
@@ -53,6 +53,7 @@ import org.eclipse.lsp4j.CompletionCapabilities;
 import org.eclipse.lsp4j.CompletionItem;
 import org.eclipse.lsp4j.CompletionItemCapabilities;
 import org.eclipse.lsp4j.CompletionList;
+import org.eclipse.lsp4j.CompletionParams;
 import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.lsp4j.DidChangeConfigurationParams;
@@ -92,7 +93,6 @@ import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.services.LanguageClientAware;
 import org.springframework.ide.vscode.commons.languageserver.HighlightParams;
 import org.springframework.ide.vscode.commons.languageserver.ProgressParams;
-import org.springframework.ide.vscode.commons.languageserver.ProjectResponse;
 import org.springframework.ide.vscode.commons.languageserver.STS4LanguageClient;
 import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits;
 import org.springframework.ide.vscode.commons.languageserver.jdt.ls.ClasspathListenerParams;
@@ -466,7 +466,7 @@ public class LanguageServerHarness<S extends SimpleLanguageServerWrapper> {
 	}
 
 	public CompletionList getCompletions(TextDocumentInfo doc, Position cursor) throws Exception {
-		TextDocumentPositionParams params = new TextDocumentPositionParams();
+		CompletionParams params = new CompletionParams();
 		params.setPosition(cursor);
 		params.setTextDocument(doc.getId());
 		waitForReconcile();