diff --git a/src/java/org/apache/poi/sl/draw/DrawTableShape.java b/src/java/org/apache/poi/sl/draw/DrawTableShape.java
index ec44d17d6..b44427838 100644
--- a/src/java/org/apache/poi/sl/draw/DrawTableShape.java
+++ b/src/java/org/apache/poi/sl/draw/DrawTableShape.java
@@ -21,7 +21,6 @@ import java.awt.Color;
 import java.awt.Graphics2D;
 
 import org.apache.poi.sl.usermodel.GroupShape;
-import org.apache.poi.sl.usermodel.StrokeStyle;
 import org.apache.poi.sl.usermodel.StrokeStyle.LineCompound;
 import org.apache.poi.sl.usermodel.StrokeStyle.LineDash;
 import org.apache.poi.sl.usermodel.TableCell;
@@ -74,7 +73,7 @@ public class DrawTableShape extends DrawShape {
      * An empty args parameter removes the affected border.
      *
      * @param args a varargs array possible containing {@link Double} (width),
-     * {@link StrokeStyle.LineCompound}, {@link Color}, {@link StrokeStyle.LineDash}
+     * {@link LineCompound}, {@link Color}, {@link LineDash}
      */
     public void setAllBorders(Object... args) {
         TableShape<?,?> table = getShape();
@@ -96,7 +95,7 @@ public class DrawTableShape extends DrawShape {
      * An empty args parameter removes the affected border.
      *
      * @param args a varargs array possible containing {@link Double} (width),
-     * {@link StrokeStyle.LineCompound}, {@link Color}, {@link StrokeStyle.LineDash}
+     * {@link LineCompound}, {@link Color}, {@link LineDash}
      */
     public void setOutsideBorders(Object... args){
         if (args.length == 0) return;
@@ -122,7 +121,7 @@ public class DrawTableShape extends DrawShape {
      * An empty args parameter removes the affected border.
      *
      * @param args a varargs array possible containing {@link Double} (width),
-     * {@link StrokeStyle.LineCompound}, {@link Color}, {@link StrokeStyle.LineDash}
+     * {@link LineCompound}, {@link Color}, {@link LineDash}
      */
     public void setInsideBorders(Object... args) {
         if (args.length == 0) return;
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java b/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java
index 8af375f51..ba1a9908f 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java
+++ b/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java
@@ -820,7 +820,7 @@ public class XDGFShape extends XDGFSheet {
      * @return returns bounds as a path in local coordinates, which is
      *         userful if you need to transform to global coordinates
      *         
-     * @warning Don't use this for 1d objects, and will fail for
+     * Warning: Don't use this for 1d objects, and will fail for
      *          infinite line objects
      */
     public Path2D.Double getBoundsAsPath() {
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
index 832c987f1..1406ee2bf 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
@@ -690,7 +690,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
     /**
      * Get a list of Hyperlinks in this sheet
      *
-     * @return
+     * @return Hyperlinks for the sheet
      */
     public List<XSSFHyperlink> getHyperlinkList() {
         return Collections.unmodifiableList(hyperlinks);