diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/markers/LSPBootCodeActionMarkerResolution.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/markers/LSPBootCodeActionMarkerResolution.java
index 2e0750525..9c2e94966 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/markers/LSPBootCodeActionMarkerResolution.java
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/markers/LSPBootCodeActionMarkerResolution.java
@@ -17,6 +17,7 @@ import org.eclipse.core.resources.IMarker;
 import org.eclipse.lsp4e.operations.codeactions.LSPCodeActionMarkerResolution;
 import org.eclipse.ui.IMarkerResolution;
 
+@SuppressWarnings("restriction")
 public class LSPBootCodeActionMarkerResolution extends LSPCodeActionMarkerResolution {
 	
 	@Override
diff --git a/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ORAstUtils.java b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ORAstUtils.java
index d2eb49146..e63611227 100644
--- a/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ORAstUtils.java
+++ b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ORAstUtils.java
@@ -423,7 +423,7 @@ public class ORAstUtils {
     				if (tree instanceof J) {
     					J t = (J) tree;
         				if (condition.test(t)) {
-        					return (J) visitor.visit(t, ctx, getCursor());
+        					return (J) visitor.visit(t, ctx, getCursor().fork());
         				}
     				}
     				return super.visit(tree, ctx);
diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml
index 53af54da1..0f902e05f 100644
--- a/headless-services/commons/pom.xml
+++ b/headless-services/commons/pom.xml
@@ -113,9 +113,9 @@
 		<commons-codec-version>1.13</commons-codec-version>
 
 		<!-- Rewrite specific properties -->
-		<rewrite-version>8.6.1</rewrite-version>
-		<rewrite-spring-version>5.0.10</rewrite-spring-version>
-		<rewrite-gradle-tooling-api-version>1.2.0</rewrite-gradle-tooling-api-version>
+		<rewrite-version>8.5.1</rewrite-version>
+		<rewrite-spring-version>5.0.11</rewrite-spring-version>
+		<rewrite-gradle-tooling-api-version>1.3.2</rewrite-gradle-tooling-api-version>
 		
 		<gradle-tooling.version>8.3</gradle-tooling.version>
 		<gradle-core.version>6.1.1</gradle-core.version>