diff --git a/paper-api/src/main/java/io/papermc/paper/datacomponent/item/Tool.java b/paper-api/src/main/java/io/papermc/paper/datacomponent/item/Tool.java
index fd606beacb..e1ef5cffa4 100644
--- a/paper-api/src/main/java/io/papermc/paper/datacomponent/item/Tool.java
+++ b/paper-api/src/main/java/io/papermc/paper/datacomponent/item/Tool.java
@@ -1,6 +1,7 @@
 package io.papermc.paper.datacomponent.item;
 
 import io.papermc.paper.datacomponent.DataComponentBuilder;
+import io.papermc.paper.datacomponent.DataComponentTypes;
 import io.papermc.paper.registry.set.RegistryKeySet;
 import java.util.Collection;
 import java.util.List;
@@ -15,7 +16,7 @@ import org.jspecify.annotations.Nullable;
 
 /**
  * Controls the behavior of the item as a tool.
- * @see io.papermc.paper.datacomponent.DataComponentTypes#TOOL
+ * @see DataComponentTypes#TOOL
  */
 @NullMarked
 @ApiStatus.Experimental
@@ -92,8 +93,6 @@ public interface Tool {
 
         /**
          * Overrides the mining speed if present and matched.
-         * <p>
-         * {@code true} will cause the block to mine at its most efficient speed, and drop items if the targeted block requires that.
          *
          * @return speed override
          */
@@ -101,6 +100,8 @@ public interface Tool {
 
         /**
          * Overrides whether this tool is considered 'correct' if present and matched.
+         * <p>
+         * {@code true} will cause the block to mine at its most efficient speed, and drop items if the targeted block requires that.
          *
          * @return a tri-state
          */
diff --git a/paper-api/src/main/java/org/bukkit/entity/AbstractArrow.java b/paper-api/src/main/java/org/bukkit/entity/AbstractArrow.java
index 945e819776..7555d641cc 100644
--- a/paper-api/src/main/java/org/bukkit/entity/AbstractArrow.java
+++ b/paper-api/src/main/java/org/bukkit/entity/AbstractArrow.java
@@ -165,7 +165,7 @@ public interface AbstractArrow extends Projectile {
      * Sets the ItemStack which will be picked up from this arrow.
      *
      * @param item ItemStack set to be picked up
-     * @deprecated use {@link #getItemStack()}
+     * @deprecated use {@link #setItemStack(ItemStack)}
      */
     @ApiStatus.Experimental
     @Deprecated(forRemoval = true, since = "1.20.4") // Paper
diff --git a/paper-api/src/main/java/org/bukkit/entity/Entity.java b/paper-api/src/main/java/org/bukkit/entity/Entity.java
index bb6c6b3477..dc91a3cf3b 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Entity.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Entity.java
@@ -1048,7 +1048,7 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
     /**
      * Check if entity is in water or rain
      *
-     * @deprecated use {@link #isInWater()}} and {@link #isInRain()}
+     * @deprecated use {@link #isInWater()} and {@link #isInRain()}
      */
     @Deprecated(since = "1.21.5")
     default boolean isInWaterOrRain() {
@@ -1068,7 +1068,7 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
     /**
      * Check if entity is in water or rain or bubble column
      *
-     * @deprecated use {@link #isInWaterOrRain()}, bubble column is considered as water
+     * @deprecated bubble column is considered as water, use {@link #isInWater()} and {@link #isInRain()}
      */
     @Deprecated(since = "1.21.5")
     default boolean isInWaterOrRainOrBubbleColumn() {