diff --git a/src/main/java/gov/usgs/earthquake/nshmp/calc/CalcConfig.java b/src/main/java/gov/usgs/earthquake/nshmp/calc/CalcConfig.java
index ecbd29e712c1af6f275ee7238c95140291ca5280..37fb6e6da6cbc2cdf5897b85ba58548f9b3333ec 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/calc/CalcConfig.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/calc/CalcConfig.java
@@ -22,8 +22,9 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 import java.util.NavigableMap;
@@ -228,14 +229,14 @@ public final class CalcConfig {
      * {@code distanceFilterUpdate} flag is registered when a model loads and at
      * this time cannot be changed with user supplied config.
      *
-     * <p><b>Default:</b> false
+     * <p><b>Default:</b> true
      */
     public final boolean distanceFilterUpdate;
 
     /**
      * Whether to apply updated grid focal mechanism application.
      *
-     * <p><b>Default:</b> false
+     * <p><b>Default:</b> true
      */
     public final boolean gridFocalMechUpdate;
 
@@ -779,10 +780,10 @@ public final class CalcConfig {
 
     /**
      * The different {@linkplain DataType types} of data to save. Note that
-     * {@link DataType#TOTAL} will <i>always</i> be included in this set,
-     * regardless of any user settings.
+     * {@link DataType#TOTAL} and {@link DataType#MAP} will <i>always</i> be
+     * included in this set, regardless of any user settings.
      *
-     * <p><b>Default:</b> [{@link DataType#TOTAL}]
+     * <p><b>Default:</b> [{@link DataType#TOTAL}, {@link DataType#MAP}]
      */
     public final Set<DataType> dataTypes;
 
@@ -796,7 +797,7 @@ public final class CalcConfig {
 
     private Output(Builder b) {
       this.directory = b.directory;
-      this.dataTypes = Collections.unmodifiableSet(b.dataTypes);
+      this.dataTypes = b.dataTypes;
       this.returnPeriods = List.copyOf(b.returnPeriods);
     }
 
@@ -815,8 +816,8 @@ public final class CalcConfig {
 
       void copy(Output that) {
         this.directory = that.directory;
-        this.dataTypes = that.dataTypes;
-        this.returnPeriods = that.returnPeriods;
+        this.dataTypes = EnumSet.copyOf(that.dataTypes);
+        this.returnPeriods = new ArrayList<>(that.returnPeriods);
       }
 
       void extend(Builder that) {