diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
index 794d27a745..f59272635f 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
@@ -331,7 +331,10 @@ public class Case implements SleuthkitCase.ErrorObserver {
             String caseDir = xmlcm.getCaseDirectory();
             String dbPath = caseDir + File.separator + "autopsy.db";
             SleuthkitCase db = SleuthkitCase.openCase(dbPath);
-
+            if (null != db.getBackupDatabasePath()) {
+                JOptionPane.showMessageDialog(null, "Updated case database schema.\nA backup copy of the database with the following path has been made:\n " + db.getBackupDatabasePath(), "Case Database Schema Update", JOptionPane.INFORMATION_MESSAGE);                
+            }
+            
             checkImagesExist(db);
 
             Case openedCase = new Case(caseName, caseNumber, examiner, configFilePath, xmlcm, db);
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
index 02a3a351fa..2178d3be0e 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
@@ -29,6 +29,7 @@ import org.openide.nodes.Children;
 import org.openide.nodes.Sheet;
 import org.openide.util.Lookup;
 import org.openide.util.lookup.Lookups;
+import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardAttribute;
 import org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE;
@@ -129,13 +130,13 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
         
         // If mismatch, add props for extension and file type
         if (artifactTypeId == BlackboardArtifact.ARTIFACT_TYPE.TSK_EXT_MISMATCH_DETECTED.getTypeID()) {
-            String actualExt = "";
-            int i = associated.getName().lastIndexOf(".");
-            if ((i > -1) && ((i + 1) < associated.getName().length())) {
-                actualExt = associated.getName().substring(i + 1).toLowerCase();
-            }                    
-            ss.put(new NodeProperty("Extension", "Extension", NO_DESCR, actualExt));        
-        
+            String ext = "";
+            if (associated instanceof AbstractFile) {
+                AbstractFile af = (AbstractFile) associated;
+                ext = af.getNameExtension();
+            }
+            ss.put(new NodeProperty("Extension", "Extension", NO_DESCR, ext));
+            
             try {
                 String actualMimeType = "";
                 ArrayList<BlackboardArtifact> artList = associated.getAllArtifacts();
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java
index 9037b9756c..459f61d694 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java
+++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java
@@ -132,11 +132,7 @@ public class FileExtMismatchIngestModule extends org.sleuthkit.autopsy.ingest.In
     
     private boolean compareSigTypeToExt(AbstractFile abstractFile) {
         try {
-            currActualExt = "";
-            int i = abstractFile.getName().lastIndexOf(".");
-            if ((i > -1) && ((i + 1) < abstractFile.getName().length())) {
-                currActualExt = abstractFile.getName().substring(i + 1).toLowerCase();
-            }
+            currActualExt = abstractFile.getNameExtension();
             
             // If we are skipping names with no extension
             if (skipNoExt && currActualExt.isEmpty()) {
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml
index 7b5c0dbb1c..bada97fa28 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml
+++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml
@@ -36,6 +36,7 @@
         <ext>php</ext>
         <ext>php3</ext>
         <ext>phtml</ext>
+        <ext>adp</ext>        
         <ext>h</ext>
         <ext>hpp</ext>
         <ext>hxx</ext>
@@ -222,6 +223,7 @@
         <ext>hta</ext>
         <ext>wpl</ext>
         <ext>htt</ext>
+        <ext>adp</ext>        
     </signature>
     <signature mimetype="image/jpeg">
         <ext>jpg</ext>