diff --git a/apps/i2psnark/java/src/org/klomp/snark/Snark.java b/apps/i2psnark/java/src/org/klomp/snark/Snark.java
index 42b2b792c..18c414289 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/Snark.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Snark.java
@@ -626,7 +626,10 @@ public class Snark
         pc.halt();
     Storage st = storage;
     if (st != null) {
-        boolean changed = storage.isChanged() || getUploaded() != savedUploaded;
+        // TODO: Cache the config-in-mem to compare vs config-on-disk
+        // (needed for auto-save to not double-save in some cases)
+        //boolean changed = storage.isChanged() || getUploaded() != savedUploaded;
+        boolean changed = true;
         try { 
             storage.close(); 
         } catch (IOException ioe) {
diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index cb6fa9fe7..f051c560c 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -105,7 +105,7 @@ public class SnarkManager implements CompleteListener {
     public static final String PROP_FILES_PUBLIC = "i2psnark.filesPublic";
     public static final String PROP_OLD_AUTO_START = "i2snark.autoStart";   // oops
     public static final String PROP_AUTO_START = "i2psnark.autoStart";      // convert in migration to new config file
-    public static final String DEFAULT_AUTO_START = "false";
+    public static final String DEFAULT_AUTO_START = "true";
     //public static final String PROP_LINK_PREFIX = "i2psnark.linkPrefix";
     //public static final String DEFAULT_LINK_PREFIX = "file:///";
     public static final String PROP_STARTUP_DELAY = "i2psnark.startupDelay";
@@ -2358,7 +2358,6 @@ public class SnarkManager implements CompleteListener {
                 if (count == 0)
                     addMessage(_("Stopping all torrents and closing the I2P tunnel."));
                 count++;
-                saveTorrentStatus(snark);
                 if (finalShutdown)
                     snark.stopTorrent(true);
                 else