diff --git a/src/java/org/apache/poi/util/StaxHelper.java b/src/java/org/apache/poi/util/StaxHelper.java
index e612d92e7f..9563666532 100644
--- a/src/java/org/apache/poi/util/StaxHelper.java
+++ b/src/java/org/apache/poi/util/StaxHelper.java
@@ -28,7 +28,7 @@ import javax.xml.stream.XMLOutputFactory;
  * @deprecated use {@link XMLHelper}
  */
 @Deprecated
-@Removal(version = "5.0.0")
+@Removal(version = "6.0.0")
 public final class StaxHelper {
     private StaxHelper() {
     }
diff --git a/src/ooxml/java/org/apache/poi/ooxml/util/SAXHelper.java b/src/ooxml/java/org/apache/poi/ooxml/util/SAXHelper.java
index a6c2b58485..1d6b7e515d 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/util/SAXHelper.java
+++ b/src/ooxml/java/org/apache/poi/ooxml/util/SAXHelper.java
@@ -30,7 +30,7 @@ import org.xml.sax.XMLReader;
  * @deprecated use {@link XMLHelper}
  */
 @Deprecated
-@Removal(version = "5.0.0")
+@Removal(version = "6.0.0")
 public final class SAXHelper {
     /**
      * Creates a new SAX XMLReader, with sensible defaults
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
index 5cf22eead5..d2194ca142 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
+++ b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
@@ -113,7 +113,10 @@ public class SXSSFWorkbook implements Workbook {
      */
     private final SharedStringsTable _sharedStringSource;
 
-    private Zip64Mode zip64Mode = Zip64Mode.AsNeeded;
+    /**
+     * controls whether Zip64 mode is used - Always became the default in POI 5.0.0
+     */
+    private Zip64Mode zip64Mode = Zip64Mode.Always;
 
     /**
      * Construct a new workbook with default row window size