diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java
index e7d7a7d53..f2dc7e0fa 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java
@@ -42,10 +42,10 @@ public abstract class STS4LanguageServerProcessStreamConnector extends ProcessSt
 	private static LanguageServerProcessReaper processReaper = new LanguageServerProcessReaper();
 
 	private Supplier<Console> consoles = null;
-	private final String connectorId;
+	private String connectorId;
 
 	public STS4LanguageServerProcessStreamConnector(ServerInfo server) {
-		this.connectorId = UUID.randomUUID().toString();
+		this.connectorId = server.bundleId;
 		this.consoles = LanguageServerConsoles.getConsoleFactory(server);
 	}
 
@@ -59,9 +59,7 @@ public abstract class STS4LanguageServerProcessStreamConnector extends ProcessSt
 			if (console!=null) {
 				forwardTo(getLanguageServerLog(), console.out);
 			} else {
-
 				new Thread("Consume LS error stream") {
-
 					@Override
 					public void run() {
 						try {
@@ -70,7 +68,6 @@ public abstract class STS4LanguageServerProcessStreamConnector extends ProcessSt
 							// ignore
 						}
 					}
-
 				}.start();
 			}
 		}
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/jdt/ls/JavaProjectsServiceWithFallback.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/jdt/ls/JavaProjectsServiceWithFallback.java
index d15351cac..b502533f0 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/jdt/ls/JavaProjectsServiceWithFallback.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/jdt/ls/JavaProjectsServiceWithFallback.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.jdt.ls;
 
-import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -31,7 +30,6 @@ import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 
 import reactor.core.Disposable;
-import reactor.core.publisher.Mono;
 
 public class JavaProjectsServiceWithFallback implements JavaProjectsService {