diff --git a/bubble-server/src/main/java/bubble/cloud/storage/local/LocalStorageDriver.java b/bubble-server/src/main/java/bubble/cloud/storage/local/LocalStorageDriver.java
index 205f2f5a..4ce80c64 100644
--- a/bubble-server/src/main/java/bubble/cloud/storage/local/LocalStorageDriver.java
+++ b/bubble-server/src/main/java/bubble/cloud/storage/local/LocalStorageDriver.java
@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import static bubble.ApiConstants.HOME_DIR;
 import static bubble.ApiConstants.ROOT_NETWORK_UUID;
 import static org.cobbzilla.util.daemon.ZillaRuntime.*;
 import static org.cobbzilla.util.io.FileUtil.*;
@@ -53,7 +54,7 @@ public class LocalStorageDriver extends CloudServiceDriverBase<LocalStorageConfi
         if (!empty(config.getBaseDir())) {
             final File base = new File(config.getBaseDir());
             if (base.isAbsolute()) return base.getAbsolutePath();
-            return new File(System.getProperty("user.home")+"/"+config.getBaseDir()).getAbsolutePath();
+            return new File(HOME_DIR+"/"+config.getBaseDir()).getAbsolutePath();
         }
 
         final File standardBaseDir = new File(LOCAL_STORAGE_STANDARD_BASE_DIR);
@@ -61,7 +62,7 @@ public class LocalStorageDriver extends CloudServiceDriverBase<LocalStorageConfi
             return abs(standardBaseDir);
         }
 
-        final File userBaseDir = new File(System.getProperty("user.home")+"/"+BUBBLE_LOCAL_STORAGE_DIR);
+        final File userBaseDir = new File(HOME_DIR+"/"+BUBBLE_LOCAL_STORAGE_DIR);
         if ((userBaseDir.exists() || userBaseDir.mkdirs()) && userBaseDir.canRead() && userBaseDir.canWrite()) {
             return abs(userBaseDir);
         }
diff --git a/bubble-server/src/main/java/bubble/server/BubbleServer.java b/bubble-server/src/main/java/bubble/server/BubbleServer.java
index ed399f0b..a59a70ae 100644
--- a/bubble-server/src/main/java/bubble/server/BubbleServer.java
+++ b/bubble-server/src/main/java/bubble/server/BubbleServer.java
@@ -65,7 +65,7 @@ public class BubbleServer extends RestServerBase<BubbleConfiguration> {
             System.getProperty("user.dir") + "/bubble.env"
     };
 
-    private static AtomicReference<String> restoreKey = new AtomicReference<>();
+    private static final AtomicReference<String> restoreKey = new AtomicReference<>();
     public static boolean isRestoreMode () { return restoreKey.get() != null; }
     public static void disableRestoreMode () {
         final BubbleNode selfNode = nodeFromFile(THIS_NODE_FILE);
diff --git a/utils/cobbzilla-utils b/utils/cobbzilla-utils
index 60856285..74230fcc 160000
--- a/utils/cobbzilla-utils
+++ b/utils/cobbzilla-utils
@@ -1 +1 @@
-Subproject commit 60856285c4f37967fd1effc438f08878607c11a9
+Subproject commit 74230fcc51ee1177a898de135a30b5b70a760e12
diff --git a/utils/cobbzilla-wizard b/utils/cobbzilla-wizard
index 6d0900b9..4dcca7b4 160000
--- a/utils/cobbzilla-wizard
+++ b/utils/cobbzilla-wizard
@@ -1 +1 @@
-Subproject commit 6d0900b9cdf1f47824ea6c50642fd0dfc664cb58
+Subproject commit 4dcca7b4ca0240ad7f2cc1d60909c0ff5830339a