diff --git a/app/src/main/java/io/xpipe/app/util/LocalExec.java b/app/src/main/java/io/xpipe/app/util/LocalExec.java
index a44f3f471..6290a0d6f 100644
--- a/app/src/main/java/io/xpipe/app/util/LocalExec.java
+++ b/app/src/main/java/io/xpipe/app/util/LocalExec.java
@@ -25,6 +25,9 @@ public class LocalExec {
             // https://bugs.openjdk.org/browse/JDK-8360500
             env.remove("_JPACKAGE_LAUNCHER");
 
+            env.remove("_JAVA_OPTIONS");
+            env.remove("JAVA_TOOL_OPTIONS");
+
             return pb.start();
         } catch (Exception ex) {
             TrackEvent.withTrace("Local command finished")
@@ -48,6 +51,9 @@ public class LocalExec {
             // https://bugs.openjdk.org/browse/JDK-8360500
             env.remove("_JPACKAGE_LAUNCHER");
 
+            env.remove("_JAVA_OPTIONS");
+            env.remove("JAVA_TOOL_OPTIONS");
+
             var process = pb.start();
             var out = process.getInputStream().readAllBytes();
             process.waitFor();
diff --git a/app/src/main/java/module-info.java b/app/src/main/java/module-info.java
index 2beb10ab7..62a509326 100644
--- a/app/src/main/java/module-info.java
+++ b/app/src/main/java/module-info.java
@@ -72,6 +72,7 @@ open module io.xpipe.app {
     requires com.fasterxml.jackson.core;
     requires com.fasterxml.jackson.databind;
     requires com.fasterxml.jackson.annotation;
+    requires com.fasterxml.jackson.datatype.jsr310;
     requires net.synedra.validatorfx;
     requires io.xpipe.modulefs;
     requires static lombok;
diff --git a/build.gradle b/build.gradle
index e521ef1a2..75b80ce39 100644
--- a/build.gradle
+++ b/build.gradle
@@ -229,7 +229,7 @@ def getCliJvmArgs() {
     // GC config
     jvmRunArgs += [
             '-XX:+UseG1GC',
-            '-Xms50m',
+            '-Xms60m',
             '-Xmx250m',
             // The default makes GC pauses longer for some reason
             '-XX:G1HeapRegionSize=4m'
@@ -311,7 +311,7 @@ project.ext {
     ci = System.getenv('CI') != null
     obfuscate = true
     fullVersion = file("$rootDir/private_files.txt").exists()
-    bundleCds = true
+    bundleCds = ci && fullVersion
 
     // Names
     productName = isStage ? 'XPipe PTB' : 'XPipe'