diff --git a/scripts/checks.sh b/scripts/checks.sh
index f35ac7c..bd5e831 100755
--- a/scripts/checks.sh
+++ b/scripts/checks.sh
@@ -2,5 +2,5 @@
 set -eo pipefail
 
 java -jar libs/google-java-format-1.7-all-deps.jar --set-exit-if-changed -i -a $(find . -type f -name "*.java" | grep ".*/src/.*java")
-mvn -X -f agent/pom.xml clean package
-mvn -X clean package
\ No newline at end of file
+mvn -f agent/pom.xml clean package
+mvn clean package
\ No newline at end of file
diff --git a/src/main/java/io/lumigo/core/configuration/Configuration.java b/src/main/java/io/lumigo/core/configuration/Configuration.java
index d43c044..7ebf090 100644
--- a/src/main/java/io/lumigo/core/configuration/Configuration.java
+++ b/src/main/java/io/lumigo/core/configuration/Configuration.java
@@ -139,6 +139,10 @@ public int maxRequestSize() {
     }
 
     public int maxBatchMessageIds() {
-        return envUtil.getIntegerEnv(LUMIGO_MAX_BATCH_MESSAGE_IDS, 20);
+        int value = envUtil.getIntegerEnv(LUMIGO_MAX_BATCH_MESSAGE_IDS, 20);
+        if (value == 0) {
+            value = 20;
+        }
+        return value;
     }
 }