diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java b/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java
index 3cf7076b39..d30ba5d79c 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java
+++ b/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java
@@ -51,8 +51,7 @@ public class HemfPlusRecordIterator implements Iterator<HemfPlusRecord> {
     public HemfPlusRecord next() {
         HemfPlusRecord toReturn = currentRecord;
         // add the size for recordId/flags/recordSize/dataSize = 12 bytes
-        final boolean isEOF = (limit == -1 || (leis.getReadIndex()-startIdx)+12 >= limit);
-        // (currentRecord instanceof HemfPlusMisc.EmfEof)
+        final boolean isEOF = (limit == -1 || (leis.getReadIndex()-startIdx)+12 > limit);
         currentRecord = isEOF ? null : _next();
         return toReturn;
     }
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java
index 4462370350..a2a7082a35 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java
+++ b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java
@@ -271,7 +271,7 @@ public class HwmfEscape implements HwmfRecord {
             }
 
             // A 32-bit unsigned integer that defines this record as a WMF Comment record.
-            int commentIdentifier = leis.readInt();
+            commentIdentifier = leis.readInt();
 
             if (commentIdentifier != EMF_COMMENT_IDENTIFIER) {
                 // there are some WMF implementation using this record as a MFCOMMENT or similar