diff --git a/poi-examples/src/main/java/org/apache/poi/examples/hwpf/Word2Forrest.java b/poi-examples/src/main/java/org/apache/poi/examples/hwpf/Word2Forrest.java
index 937da16a33..6547d2e8cc 100644
--- a/poi-examples/src/main/java/org/apache/poi/examples/hwpf/Word2Forrest.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hwpf/Word2Forrest.java
@@ -59,7 +59,7 @@ public final class Word2Forrest
     {
       Paragraph p = r.getParagraph (x);
       String text = p.text ();
-      if (text.trim ().length () == 0)
+      if (text.trim().isEmpty())
       {
         continue;
       }
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java
index 5144729fa3..5e6bd25c46 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java
@@ -608,7 +608,7 @@ public class XSSFRow implements Row, Comparable<XSSFRow> {
         }
 
         // remove any remaining illegal references in _rows.cArray
-        while(_row.getCArray().length > _cells.size()) {
+        while(_row.sizeOfCArray() > _cells.size()) {
             _row.removeC(_cells.size());
         }
     }
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
index 36d1350d59..88a603e160 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
@@ -1155,7 +1155,7 @@ public class XWPFDocument extends POIXMLDocument implements Document, IBody {
      * @return the LastParagraph of the document
      */
     public XWPFParagraph getLastParagraph() {
-        int lastPos = paragraphs.toArray().length - 1;
+        final int lastPos = paragraphs.size() - 1;
         return paragraphs.get(lastPos);
     }
 
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
index 95ab1237c1..7f3ab37ff6 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
@@ -203,7 +203,7 @@ public class XWPFParagraph implements IBodyElement, IRunBody, ISDTContents, Para
             if (run instanceof XWPFRun) {
                 XWPFRun xRun = (XWPFRun) run;
                 // don't include the text if reviewing is enabled and this is a deleted run
-                if (xRun.getCTR().getDelTextArray().length == 0) {
+                if (xRun.getCTR().sizeOfDelTextArray() == 0) {
                     out.append(xRun);
                 }
             } else if (run instanceof XWPFSDT) {
diff --git a/poi/src/main/java/org/apache/poi/poifs/property/PropertyTable.java b/poi/src/main/java/org/apache/poi/poifs/property/PropertyTable.java
index 203f23cd46..062627ae52 100644
--- a/poi/src/main/java/org/apache/poi/poifs/property/PropertyTable.java
+++ b/poi/src/main/java/org/apache/poi/poifs/property/PropertyTable.java
@@ -83,11 +83,14 @@ public final class PropertyTable implements BATManaged {
 
         for (ByteBuffer bb : dataSource) {
             // Turn it into an array
-            byte[] data;
-            if (bb.hasArray() && bb.arrayOffset() == 0 &&
-                    bb.array().length == _bigBigBlockSize.getBigBlockSize()) {
-                data = bb.array();
-            } else {
+            byte[] data = null;
+            if (bb.hasArray() && bb.arrayOffset() == 0) {
+                final byte[] array = bb.array();
+                if (array.length == _bigBigBlockSize.getBigBlockSize()) {
+                    data = array;
+                }
+            }
+            if (data == null) {
                 data = IOUtils.safelyAllocate(_bigBigBlockSize.getBigBlockSize(), POIFSFileSystem.getMaxRecordLength());
 
                 int toRead = data.length;