diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ClassReferenceProvider.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ClassReferenceProvider.java
index 2618837bc..411696a4c 100644
--- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ClassReferenceProvider.java
+++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ClassReferenceProvider.java
@@ -146,7 +146,7 @@ public class ClassReferenceProvider extends CachingValueProvider {
 			return javaProject.getClasspath()
 					.fuzzySearchTypes(query, type -> allSubclasses.contains(type))
 					.collectSortedList((o1, o2) -> o2.getT2().compareTo(o1.getT2()))
-					.flatMap(l -> Flux.fromIterable(l))
+					.flatMapIterable(l -> l)
 					.map(t -> StsValueHint.create(t.getT1()));
 		}
 	}
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProvider.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProvider.java
index 2f9886766..9e8957ee0 100644
--- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProvider.java
+++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProvider.java
@@ -45,7 +45,7 @@ public class LoggerNameProvider extends CachingValueProvider {
 				.map(t -> Tuples.of(StsValueHint.create(t.getT1()), t.getT2()))
 			)
 		.collectSortedList((o1, o2) -> o2.getT2().compareTo(o1.getT2()))
-		.flatMap(l -> Flux.fromIterable(l))
+		.flatMapIterable(l -> l)
 		.map(t -> t.getT1());
 	}