diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java
index b838eedf7b6b..fcf99aa19ad4 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java
@@ -1028,7 +1028,7 @@ public static long estimatedHeapSizeOf(final Cell cell) {
    * @param length
    * @return iterator for the tags
    * @deprecated As of 2.0.0 and will be removed in 3.0.0
-   *             Instead use {@link #tagsIterator(Cell)}
+   *             Instead use {@link PrivateCellUtil#tagsIterator(Cell)}
    */
   @Deprecated
   public static Iterator<Tag> tagsIterator(final byte[] tags, final int offset, final int length) {
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java
index 96b8e9fa7d94..40f1a08f32da 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java
@@ -800,9 +800,8 @@ private void runIncrementalPELoad(Configuration conf, List<HFileOutputFormat2.Ta
   }
 
   /**
-   * Test for {@link HFileOutputFormat2#configureCompression(Configuration, HTableDescriptor)} and
-   * {@link HFileOutputFormat2#createFamilyCompressionMap(Configuration)}.
-   * Tests that the compression map is correctly serialized into
+   * Test for {@link HFileOutputFormat2#createFamilyCompressionMap(Configuration)}.
+   * Tests that the family compression map is correctly serialized into
    * and deserialized from configuration
    *
    * @throws IOException
@@ -872,9 +871,8 @@ private void setupMockColumnFamiliesForCompression(Table table,
 
 
   /**
-   * Test for {@link HFileOutputFormat2#configureBloomType(HTableDescriptor, Configuration)} and
-   * {@link HFileOutputFormat2#createFamilyBloomTypeMap(Configuration)}.
-   * Tests that the compression map is correctly serialized into
+   * Test for {@link HFileOutputFormat2#createFamilyBloomTypeMap(Configuration)}.
+   * Tests that the family bloom type map is correctly serialized into
    * and deserialized from configuration
    *
    * @throws IOException
@@ -943,9 +941,8 @@ private void setupMockColumnFamiliesForBloomType(Table table,
   }
 
   /**
-   * Test for {@link HFileOutputFormat2#configureBlockSize(HTableDescriptor, Configuration)} and
-   * {@link HFileOutputFormat2#createFamilyBlockSizeMap(Configuration)}.
-   * Tests that the compression map is correctly serialized into
+   * Test for {@link HFileOutputFormat2#createFamilyBlockSizeMap(Configuration)}.
+   * Tests that the family block size map is correctly serialized into
    * and deserialized from configuration
    *
    * @throws IOException
@@ -1020,9 +1017,8 @@ private void setupMockColumnFamiliesForBlockSize(Table table,
   }
 
   /**
-   * Test for {@link HFileOutputFormat2#configureDataBlockEncoding(HTableDescriptor, Configuration)}
-   * and {@link HFileOutputFormat2#createFamilyDataBlockEncodingMap(Configuration)}.
-   * Tests that the compression map is correctly serialized into
+   * Test for {@link HFileOutputFormat2#createFamilyDataBlockEncodingMap(Configuration)}.
+   * Tests that the family data block encoding map is correctly serialized into
    * and deserialized from configuration
    *
    * @throws IOException
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
index 8b644b0d77ef..3ae38864ba1e 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
@@ -29,7 +29,6 @@
 import org.apache.hadoop.hbase.executor.EventType;
 import org.apache.hadoop.hbase.procedure2.Procedure;
 import org.apache.hadoop.hbase.regionserver.HRegion;
-import org.apache.hadoop.hbase.regionserver.Region;
 import org.apache.hadoop.hbase.regionserver.RegionServerServices;
 import org.apache.hadoop.hbase.regionserver.RegionServerServices.PostOpenDeployContext;
 import org.apache.hadoop.hbase.regionserver.RegionServerServices.RegionStateTransitionContext;
@@ -224,7 +223,8 @@ private boolean updateMeta(final HRegion r, long masterSystemTime) {
 
   /**
    * Thread to run region post open tasks. Call {@link #getException()} after the thread finishes
-   * to check for exceptions running {@link RegionServerServices#postOpenDeployTasks(Region)}.
+   * to check for exceptions running
+   * {@link RegionServerServices#postOpenDeployTasks(PostOpenDeployContext)}
    */
   static class PostOpenDeployTasksThread extends Thread {
     private Throwable exception = null;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
index 8e2ef270975b..0cd0c2cfeddf 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
@@ -83,9 +83,8 @@ public class TestStoreScanner {
   /**
    * From here on down, we have a bunch of defines and specific CELL_GRID of Cells. The
    * CELL_GRID then has a Scanner that can fake out 'block' transitions. All this elaborate
-   * setup is for tests that ensure we don't overread, and that the
-   * {@link StoreScanner#optimize(org.apache.hadoop.hbase.regionserver.querymatcher.ScanQueryMatcher.MatchCode,
-   * Cell)} is not overly enthusiastic.
+   * setup is for tests that ensure we don't overread, and that the {@link StoreScanner} is not
+   * overly enthusiastic.
    */
   private static final byte[] ZERO = new byte[] {'0'};
   private static final byte[] ZERO_POINT_ZERO = new byte[] {'0', '.', '0'};