diff --git a/pom.xml b/pom.xml
index a17daab8c..0ae060b19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,8 @@
 		<dependency>
 			<groupId>io.reactivex.rxjava3</groupId>
 			<artifactId>rxjava</artifactId>
-			<version>${rxjava3}</version>
+			<!-- Javadoc on Java 24 fails otherwise with: Cannot attach type annotations -->
+			<version>3.1.1</version>
 			<optional>true</optional>
 		</dependency>
 
diff --git a/src/main/java/org/springframework/data/aot/AotContext.java b/src/main/java/org/springframework/data/aot/AotContext.java
index 6cdec087a..ab62c1a45 100644
--- a/src/main/java/org/springframework/data/aot/AotContext.java
+++ b/src/main/java/org/springframework/data/aot/AotContext.java
@@ -72,7 +72,6 @@ public interface AotContext extends EnvironmentCapable {
 	 * Create an {@link AotContext} backed by the given {@link BeanFactory}.
 	 *
 	 * @param beanFactory reference to the {@link BeanFactory}; must not be {@literal null}.
-	 * @return a new instance of {@link AotContext}.
 	 * @param environment reference to the {@link Environment}; must not be {@literal null}.
 	 * @return a new instance of {@link AotContext}.
 	 * @see BeanFactory
diff --git a/src/main/java/org/springframework/data/convert/CustomConversions.java b/src/main/java/org/springframework/data/convert/CustomConversions.java
index f70cb37c6..a950e8705 100644
--- a/src/main/java/org/springframework/data/convert/CustomConversions.java
+++ b/src/main/java/org/springframework/data/convert/CustomConversions.java
@@ -137,7 +137,7 @@ public class CustomConversions {
 	/**
 	 * Creates a new {@link CustomConversions} instance registering all given user defined converters and selecting
 	 * {@link Converter converters} from {@link StoreConversions} depending on
-	 * {@link StoreConversions#getSimpleTypeHolder() store simple types} only considering those that either convert
+	 * {@link CustomConversions#getSimpleTypeHolder() store simple types} only considering those that either convert
 	 * to/from a store supported type.
 	 *
 	 * @param storeConversions must not be {@literal null}.
diff --git a/src/main/java/org/springframework/data/repository/core/support/RepositoryComposition.java b/src/main/java/org/springframework/data/repository/core/support/RepositoryComposition.java
index da3699c3a..144d1c97a 100644
--- a/src/main/java/org/springframework/data/repository/core/support/RepositoryComposition.java
+++ b/src/main/java/org/springframework/data/repository/core/support/RepositoryComposition.java
@@ -354,12 +354,6 @@ public class RepositoryComposition {
 		return this.methodLookup;
 	}
 
-	/**
-	 * Value object representing an ordered list of {@link RepositoryFragment fragments}.
-	 *
-	 * @author Mark Paluch
-	 * @author Christoph Strobl
-	 */
 	@Override
 	public boolean equals(Object o) {
 
@@ -383,6 +377,12 @@ public class RepositoryComposition {
 		return this.argumentConverter;
 	}
 
+	/**
+	 * Value object representing an ordered list of {@link RepositoryFragment fragments}.
+	 *
+	 * @author Mark Paluch
+	 * @author Christoph Strobl
+	 */
 	public static class RepositoryFragments implements Streamable<RepositoryFragment<?>> {
 
 		static final RepositoryFragments EMPTY = new RepositoryFragments(Collections.emptyList());