diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
index 9a024688f8..4d4b917ed4 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
@@ -665,8 +665,8 @@ public final class PackagingURIHelper {
      *
      * If  part name is not a valid URI, it is resolved as follows:
      * <p>
-     * 1. Percent-encode each open bracket ([) and close bracket (]).</li>
-     * 2. Percent-encode each percent (%) character that is not followed by a hexadecimal notation of an octet value.</li>
+     * 1. Percent-encode each open bracket ([) and close bracket (]).
+     * 2. Percent-encode each percent (%) character that is not followed by a hexadecimal notation of an octet value.
      * 3. Un-percent-encode each percent-encoded unreserved character.
      * 4. Un-percent-encode each forward slash (/) and back slash (\).
      * 5. Convert all back slashes to forward slashes.
@@ -728,9 +728,10 @@ public final class PackagingURIHelper {
      * percent-encode white spaces and characters above 0x80.
      * <p>
      *   Examples:
+     *   <blockquote><pre>
      *   'Apache POI' --> 'Apache%20POI'
      *   'Apache\u0410POI' --> 'Apache%04%10POI'
-     *
+     *   </pre></blockquote>
      * @param s the string to encode
      * @return  the encoded string
      */
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableColumn.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableColumn.java
index 6cb483db13..7d1f4661cd 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableColumn.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableColumn.java
@@ -75,7 +75,7 @@ public class XSSFTableColumn {
      * 
      * It is up to the caller to enforce the uniqueness of the id.
      * 
-     * @return the column id
+     * @param columnId the column id
      * @since 4.0.0
      */
     public void setId(long columnId) {
@@ -95,7 +95,7 @@ public class XSSFTableColumn {
     /**
      * Get the name of the column, which is is unique per table.
      * 
-     * @return the column name
+     * @param columnName  the column name
      * @since 4.0.0
      */
     public void setName(String columnName) {