diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ExportCSVAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ExportCSVAction.java
index 84ba946997d..cd5997466d8 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/ExportCSVAction.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/ExportCSVAction.java
@@ -25,7 +25,10 @@
 import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
 import java.lang.reflect.InvocationTargetException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -319,7 +322,8 @@ public boolean cancel() {
 
             CsvMapper mapper = new CsvMapper();
             ObjectWriter writer = mapper.writerFor(Map.class).with(schema);
-            try (SequenceWriter seqWriter = writer.writeValues(outputFile)) {
+            try (OutputStreamWriter outWriter = new OutputStreamWriter(new FileOutputStream(outputFile), StandardCharsets.UTF_8); 
+                    SequenceWriter seqWriter = writer.writeValues(outWriter)) {
                 // Write each line
                 Iterator<?> nodeIterator = nodesToExport.iterator();
                 while (nodeIterator.hasNext()) {
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
index dd528087ddd..05fda25492f 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
@@ -85,6 +85,8 @@ public void startUp(IngestJobContext context) throws IngestModuleException {
         extractors.add(recycleBin);
         extractors.add(jumpList);
         extractors.add(recentDocuments);
+        extractors.add(sru);
+        extractors.add(prefetch);
         extractors.add(registry); //  needs to run before the DataSourceUsageAnalyzer
         extractors.add(osExtract); // this needs to run before the DataSourceUsageAnalyzer
         extractors.add(dataSourceAnalyzer); //this needs to run after ExtractRegistry and ExtractOs
@@ -96,8 +98,6 @@ public void startUp(IngestJobContext context) throws IngestModuleException {
         extractors.add(SEUQA); // this needs to run after the web browser modules
         extractors.add(webAccountType); // this needs to run after the web browser modules
         extractors.add(zoneInfo); // this needs to run after the web browser modules
-        extractors.add(sru);
-        extractors.add(prefetch);
         extractors.add(messageDomainType);
 
         browserExtractors.add(chrome);
diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
index 80b35b4544c..b7a0c9c9795 100644
--- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
+++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
@@ -770,9 +770,15 @@ private BlackboardArtifact addEmailArtifact(EmailMessage email, AbstractFile abs
                 ATTRIBUTE_TYPE.TSK_MSG_ID, bbattributes);
 
         try {
-             addArtifactAttribute((email.hasAttachment() ? "Yes" : ""), 
-                    blackboard.getOrAddAttributeType("EMAIL_HAS_ATTACHMENT", BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING, "Has Attachments"),
+             if (email.hasAttachment()) {
+                 addArtifactAttribute("Yes", 
+                    blackboard.getOrAddAttributeType("EMAIL_HAS_ATTACHMENT", BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING, "Has Attachment"),
                     bbattributes);
+             } else {
+                 addArtifactAttribute("No", 
+                    blackboard.getOrAddAttributeType("EMAIL_HAS_ATTACHMENT", BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING, "Has Attachment"),
+                    bbattributes);
+             }
         } catch (Blackboard.BlackboardException ex) {
             logger.log(Level.SEVERE, "Unable to create EMAIL_HAS_ATTACHMENT attribute" , ex); //NON-NLS 
         }