diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
index afc2e0dc5..7a7bca761 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
@@ -355,7 +355,7 @@
             class="org.springframework.tooling.boot.ls.prefs.RemoteAppsFromPrefsDataContributor">
       </injection>
    </extension>
- <!--  <extension
+   <extension
          point="org.eclipse.wildwebdeveloper.xml.lemminxExtension">
       <jar
             path="jars/commons-lsp-extensions.jar">
@@ -363,6 +363,6 @@
       <jar
             path="jars/xml-ls-extension.jar">
       </jar>
-   </extension> -->
+   </extension>
 
 </plugin>
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/xml/XMLContentAssistProposalComputer.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/xml/XMLContentAssistProposalComputer.java
index feb2cdcea..9482dbaa0 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/xml/XMLContentAssistProposalComputer.java
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/xml/XMLContentAssistProposalComputer.java
@@ -34,7 +34,7 @@ import org.springframework.tooling.boot.ls.Constants;
 public class XMLContentAssistProposalComputer implements IAsyncCompletionProposalComputer {
 
 	private static TimeUnit TIMEOUT_UNIT = TimeUnit.MILLISECONDS;
-	private static long TIMEOUT_LENGTH = 2000;
+	private static long TIMEOUT_LENGTH = 30000;
 
 	private LSContentAssistProcessor lsContentAssistProcessor;
 
diff --git a/headless-services/xml-ls-extension/src/main/java/org/springframework/ide/vscode/xml/namespaces/classpath/FilteringURLResourceLoader.java b/headless-services/xml-ls-extension/src/main/java/org/springframework/ide/vscode/xml/namespaces/classpath/FilteringURLResourceLoader.java
index c7fc76fb4..848db6add 100644
--- a/headless-services/xml-ls-extension/src/main/java/org/springframework/ide/vscode/xml/namespaces/classpath/FilteringURLResourceLoader.java
+++ b/headless-services/xml-ls-extension/src/main/java/org/springframework/ide/vscode/xml/namespaces/classpath/FilteringURLResourceLoader.java
@@ -16,13 +16,13 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSetMultimap;