diff --git a/src/main/java/org/openrewrite/java/spring/NoRequestMappingAnnotation.java b/src/main/java/org/openrewrite/java/spring/NoRequestMappingAnnotation.java
index c5a615db5..e664a067e 100644
--- a/src/main/java/org/openrewrite/java/spring/NoRequestMappingAnnotation.java
+++ b/src/main/java/org/openrewrite/java/spring/NoRequestMappingAnnotation.java
@@ -100,7 +100,7 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ct
                 if (resolvedRequestMappingAnnotationClassName != null) {
                     maybeAddImport("org.springframework.web.bind.annotation." + resolvedRequestMappingAnnotationClassName);
                     a = (J.Annotation) new ChangeType("org.springframework.web.bind.annotation.RequestMapping",
-                            "org.springframework.web.bind.annotation." + resolvedRequestMappingAnnotationClassName)
+                            "org.springframework.web.bind.annotation." + resolvedRequestMappingAnnotationClassName, false)
                             .getVisitor().visit(a, ctx, getCursor());
                 }
 
diff --git a/src/main/java/org/openrewrite/java/spring/data/MigrateQuerydslJpaRepository.java b/src/main/java/org/openrewrite/java/spring/data/MigrateQuerydslJpaRepository.java
index d3cd6d1f3..040be056f 100644
--- a/src/main/java/org/openrewrite/java/spring/data/MigrateQuerydslJpaRepository.java
+++ b/src/main/java/org/openrewrite/java/spring/data/MigrateQuerydslJpaRepository.java
@@ -56,7 +56,7 @@ protected JavaVisitor<ExecutionContext> getVisitor() {
             @Override
             public J visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
                 J.CompilationUnit c = (J.CompilationUnit)super.visitCompilationUnit(cu, ctx);
-                doAfterVisit(new ChangeType(originalFqn, targetFqn));
+                doAfterVisit(new ChangeType(originalFqn, targetFqn, false));
                 return c;
             }
 
@@ -64,7 +64,7 @@ public J visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
             public J visitParameterizedType(J.ParameterizedType type, ExecutionContext context) {
                 J.ParameterizedType t = (J.ParameterizedType) super.visitParameterizedType(type, context);
                 if (t.getClazz() instanceof J.Identifier && TypeUtils.isOfType(TypeUtils.asFullyQualified(t.getClazz().getType()),
-                        TypeUtils.asFullyQualified(JavaType.Class.build(originalFqn))) &&
+                        TypeUtils.asFullyQualified(JavaType.ShallowClass.build(originalFqn))) &&
                         t.getTypeParameters() != null && t.getTypeParameters().size() == 2) {
                     t = t.withTypeParameters(t.getTypeParameters().subList(0, 1));
                 }
diff --git a/src/main/java/org/openrewrite/java/spring/framework/MigrateInstantiationAwareBeanPostProcessorAdapter.java b/src/main/java/org/openrewrite/java/spring/framework/MigrateInstantiationAwareBeanPostProcessorAdapter.java
index 5e7ac77ba..49000ec8b 100644
--- a/src/main/java/org/openrewrite/java/spring/framework/MigrateInstantiationAwareBeanPostProcessorAdapter.java
+++ b/src/main/java/org/openrewrite/java/spring/framework/MigrateInstantiationAwareBeanPostProcessorAdapter.java
@@ -72,7 +72,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
             @Override
             public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionContext executionContext) {
                 J.CompilationUnit compilationUnit = super.visitCompilationUnit(cu, executionContext);
-                doAfterVisit(new ChangeType(fromExtendingFqn, toImplementsFqn));
+                doAfterVisit(new ChangeType(fromExtendingFqn, toImplementsFqn, false));
                 return compilationUnit;
             }
         };