diff --git a/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/PhotoRecCarverFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/PhotoRecCarverFileIngestModule.java
index ffb9d7b8f9..03a64220fb 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/PhotoRecCarverFileIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/PhotoRecCarverFileIngestModule.java
@@ -71,7 +71,7 @@ import org.sleuthkit.autopsy.ingest.ModuleContentEvent;
 @NbBundle.Messages({
     "PhotoRecIngestModule.PermissionsNotSufficient=Insufficient permissions accessing",
     "PhotoRecIngestModule.PermissionsNotSufficientSeeReference=See 'Shared Drive Authentication' in Autopsy help.",
-    "cannotCreateOutputDir.message=Unable to create output directory: {0}.",
+    "# {0} - output directory name", "cannotCreateOutputDir.message=Unable to create output directory: {0}.",
     "unallocatedSpaceProcessingSettingsError.message='Process Unallocated Space' is not checked. The PhotoRec module is designed to carve unallocated space. Either enable processing of unallocated space or disable this module.",
     "unsupportedOS.message=PhotoRec module is supported on Windows platforms only.",
     "missingExecutable.message=Unable to locate PhotoRec executable.",
diff --git a/Core/src/org/sleuthkit/autopsy/modules/vmextractor/VMExtractorIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/vmextractor/VMExtractorIngestModule.java
index 3998f161ed..25f82331da 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/vmextractor/VMExtractorIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/vmextractor/VMExtractorIngestModule.java
@@ -59,8 +59,7 @@ import org.sleuthkit.datamodel.TskDataException;
  * An ingest module that extracts virtual machine files and adds them to a case
  * as data sources.
  */
-@NbBundle.Messages({
-    "VMExtractorIngestModule.cannotCreateOutputDir.message=Unable to create output directory: {0}."
+@NbBundle.Messages({"# {0} - output directory name", "VMExtractorIngestModule.cannotCreateOutputDir.message=Unable to create output directory: {0}."
 })
 final class VMExtractorIngestModule extends DataSourceIngestModuleAdapter {
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
index 2aaffe8468..cda05d86b3 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
@@ -54,10 +54,10 @@ import org.sleuthkit.datamodel.TskData.FileKnown;
  * Reports interesting events to Inbox and to viewers
  */
 @NbBundle.Messages({
-    "KeywordSearchIngestModule.init.tryStopSolrMsg={0}<br />Please try stopping Java Solr processes if any exist and restart the application.",
+    "# {0} - Reason for not starting Solr", "KeywordSearchIngestModule.init.tryStopSolrMsg={0}<br />Please try stopping Java Solr processes if any exist and restart the application.",
     "KeywordSearchIngestModule.init.badInitMsg=Keyword search server was not properly initialized, cannot run keyword search ingest.",
     "SolrConnectionCheck.Port=Invalid port number.",
-    "KeywordSearchIngestModule.init.exception.errConnToSolr.msg=Error connecting to SOLR server: {0}.",
+    "# {0} - Reason for not connecting to Solr", "KeywordSearchIngestModule.init.exception.errConnToSolr.msg=Error connecting to SOLR server: {0}.",
     "KeywordSearchIngestModule.startUp.noOpenCore.msg=The index could not be opened or does not exist.",
     "CannotRunFileTypeDetection=Unable to run file type detection."
 })
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java
index b96d485b2a..4ef892ffc9 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java
@@ -62,7 +62,7 @@ import org.xml.sax.SAXException;
     "cannotBuildXmlParser=Unable to build XML parser: ",
     "cannotLoadSEUQA=Unable to load Search Engine URL Query Analyzer settings file, SEUQAMappings.xml: ",
     "cannotParseXml=Unable to parse XML file: ",
-    "SearchEngineURLQueryAnalyzer.init.exception.msg=Unable to find {0}."
+    "# {0} - file name", "SearchEngineURLQueryAnalyzer.init.exception.msg=Unable to find {0}."
 })
 class SearchEngineURLQueryAnalyzer extends Extract {