diff --git a/src/main/java/com/volmit/iris/core/project/IrisProject.java b/src/main/java/com/volmit/iris/core/project/IrisProject.java
index 1ee3f5b0a..137d273f7 100644
--- a/src/main/java/com/volmit/iris/core/project/IrisProject.java
+++ b/src/main/java/com/volmit/iris/core/project/IrisProject.java
@@ -217,11 +217,9 @@ public class IrisProject {
 
         try {
             PrecisionStopwatch p = PrecisionStopwatch.start();
-            Iris.info("Building Workspace: " + ws.getPath());
             JSONObject j = createCodeWorkspaceConfig();
             IO.writeAll(ws, j.toString(4));
             p.end();
-            Iris.info("Building Workspace: " + ws.getPath() + " took " + Form.duration(p.getMilliseconds(), 2));
             return true;
         } catch (Throwable e) {
             Iris.reportError(e);
diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java
index cc1c6ad76..f47a63364 100644
--- a/src/main/java/com/volmit/iris/engine/IrisEngine.java
+++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java
@@ -23,6 +23,7 @@ import com.google.gson.Gson;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.events.IrisEngineHotloadEvent;
+import com.volmit.iris.core.project.IrisProject;
 import com.volmit.iris.core.service.PreservationSVC;
 import com.volmit.iris.engine.actuator.IrisBiomeActuator;
 import com.volmit.iris.engine.actuator.IrisDecorantActuator;
@@ -145,6 +146,7 @@ public class IrisEngine implements Engine {
         caveModifier.close();
         postModifier.close();
         effects.close();
+        J.a(() -> new IrisProject(getData().getDataFolder()).updateWorkspace());
     }
 
     private void setupEngine() {
diff --git a/src/main/java/com/volmit/iris/engine/object/carving/IrisCavePlacer.java b/src/main/java/com/volmit/iris/engine/object/carving/IrisCavePlacer.java
index 28215d139..84e75d801 100644
--- a/src/main/java/com/volmit/iris/engine/object/carving/IrisCavePlacer.java
+++ b/src/main/java/com/volmit/iris/engine/object/carving/IrisCavePlacer.java
@@ -112,6 +112,13 @@ public class IrisCavePlacer implements IRare {
     }
 
     public int getSize(IrisData data) {
-        return getRealCave(data).getMaxSize(data);
+        IrisCave cave = getRealCave(data);
+
+        if(cave != null)
+        {
+            return cave.getMaxSize(data);
+        }
+
+        return 32;
     }
 }