diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
index 01b30b1fd1..a5e5ebb9bd 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
@@ -472,7 +472,7 @@ public class Case implements SleuthkitCase.ErrorObserver {
             logger.log(Level.SEVERE, "Error accessing case database connection info", ex); //NON-NLS
             SwingUtilities.invokeLater(() -> {
                 WindowManager.getDefault().getMainWindow().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-            });            
+            });
             throw new CaseActionException(
                     NbBundle.getMessage(Case.class, "Case.databaseConnectionInfo.error.msg"), ex);
         }
@@ -1590,12 +1590,10 @@ public class Case implements SleuthkitCase.ErrorObserver {
 
             if (RuntimeProperties.coreComponentsAreActive()) {
                 // enable these menus
-                SwingUtilities.invokeLater(() -> {
                     CallableSystemAction.get(AddImageAction.class).setEnabled(true);
                     CallableSystemAction.get(CaseCloseAction.class).setEnabled(true);
                     CallableSystemAction.get(CasePropertiesAction.class).setEnabled(true);
                     CallableSystemAction.get(CaseDeleteAction.class).setEnabled(true); // Delete Case menu
-                });
 
                 if (toChangeTo.hasData()) {
                     // open all top components
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java
index 51b4ada972..b480966937 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java
@@ -64,7 +64,7 @@ public class VolumeNode extends AbstractContentNode<Volume> {
         // set name, display name, and icon
         String volName = nameForVolume(vol);
 
-        long end = vol.getStart() + (vol.getSize() - 1);
+        long end = vol.getStart() + (vol.getLength() - 1);
         String tempVolName = volName + " (" + vol.getDescription() + ": " + vol.getStart() + "-" + end + ")";
         this.setDisplayName(tempVolName);
 
diff --git a/test/script/tskdbdiff.py b/test/script/tskdbdiff.py
index 5f2095d7a7..9db3aeb863 100755
--- a/test/script/tskdbdiff.py
+++ b/test/script/tskdbdiff.py
@@ -44,12 +44,19 @@ class TskDbDiff(object):
         self.output_dir = output_dir
         self.gold_bb_dump = gold_bb_dump
         self.gold_dump = gold_dump
+        self._generate_gold_dump = False        
+        self._generate_gold_bb_dump = False
         self._bb_dump_diff = ""
         self._dump_diff = ""
         self._bb_dump = ""
         self._dump = ""
         self.verbose = verbose
 
+        if self.gold_bb_dump is None:
+            self._generate_gold_bb_dump = True
+        if self.gold_dump is None:
+            self._generate_gold_dump = True
+
     def run_diff(self):
         """Compare the databases.
 
@@ -59,6 +66,12 @@ class TskDbDiff(object):
 
         self._init_diff()
 
+        # generate the gold database dumps if necessary     
+        if self._generate_gold_dump:       
+            TskDbDiff._dump_output_db_nonbb(self.gold_db_file, self.gold_dump)     
+        if self._generate_gold_bb_dump:        
+            TskDbDiff._dump_output_db_bb(self.gold_db_file, self.gold_bb_dump)
+
         # generate the output database dumps (both DB and BB)
         TskDbDiff._dump_output_db_nonbb(self.output_db_file, self._dump)
         TskDbDiff._dump_output_db_bb(self.output_db_file, self._bb_dump)