diff --git a/config/dpkg/changelog b/config/dpkg/changelog
index 7390f90e04..82e5a515b9 100644
--- a/config/dpkg/changelog
+++ b/config/dpkg/changelog
@@ -2,4 +2,4 @@ plaso (20260720-1) unstable; urgency=low
 
   * Auto-generated
 
- -- Log2Timeline maintainers <log2timeline-maintainers@googlegroups.com>  Mon, 20 Jul 2026 05:58:31 +0200
+ -- Log2Timeline maintainers <log2timeline-maintainers@googlegroups.com>  Mon, 20 Jul 2026 09:23:43 +0200
diff --git a/plaso/cli/helpers/opensearch_ts_output.py b/plaso/cli/helpers/opensearch_ts_output.py
index b25af9d25a..934b307f07 100644
--- a/plaso/cli/helpers/opensearch_ts_output.py
+++ b/plaso/cli/helpers/opensearch_ts_output.py
@@ -37,7 +37,7 @@ def AddArguments(cls, argument_group):
             default=cls._DEFAULT_TIMELINE_IDENTIFIER,
             action="store",
             metavar="IDENTIFIER",
-            help=("The identifier of the timeline in Timesketch."),
+            help="The identifier of the timeline in Timesketch.",
         )
 
     @classmethod
@@ -56,19 +56,17 @@ def ParseOptions(cls, options, output_module):  # pylint: disable=arguments-rena
             output_module, opensearch_ts.OpenSearchTimesketchOutputModule
         ):
             raise errors.BadConfigObject(
-                "Output module is not an instance of OpenSearchsearchOutputModule"
+                "Output module is not an instance of OpenSearchTimesketchOutputModule"
             )
 
         opensearch_output.OpenSearchOutputArgumentsHelper.ParseOptions(
             options, output_module
         )
-
         timeline_identifier = cls._ParseNumericOption(
             options,
             "timeline_identifier",
             default_value=cls._DEFAULT_TIMELINE_IDENTIFIER,
         )
-
         if timeline_identifier:
             output_module.SetTimelineIdentifier(timeline_identifier)
 
diff --git a/plaso/cli/storage_media_tool.py b/plaso/cli/storage_media_tool.py
index c94bf48632..2889a5ba84 100644
--- a/plaso/cli/storage_media_tool.py
+++ b/plaso/cli/storage_media_tool.py
@@ -287,6 +287,7 @@ def _ScanVolumeSystemRoot(self, scan_context, scan_node, options, base_path_spec
             volume_identifiers = self._GetVolumeIdentifiers(volume_system, options)
 
         elif scan_node.type_indicator in (
+            dfvfs_definitions.TYPE_INDICATOR_APM,
             dfvfs_definitions.TYPE_INDICATOR_GPT,
             dfvfs_definitions.TYPE_INDICATOR_TSK_PARTITION,
         ):
diff --git a/plaso/formatters/msiecf.py b/plaso/formatters/msiecf.py
index 8d0f448a7f..28337d0701 100644
--- a/plaso/formatters/msiecf.py
+++ b/plaso/formatters/msiecf.py
@@ -24,7 +24,7 @@ def FormatEventValues(self, output_mediator, event_values):
             event_values["cached_file_path"] = cached_file_path
 
 
-class MSIECFHTTPHeadersventFormatterHelper(interface.CustomEventFormatterHelper):
+class MSIECFHTTPHeadersEventFormatterHelper(interface.CustomEventFormatterHelper):
     """MSIE cache file HTTP headers formatter helper."""
 
     IDENTIFIER = "msiecf_http_headers"
@@ -42,5 +42,5 @@ def FormatEventValues(self, output_mediator, event_values):
 
 
 manager.FormattersManager.RegisterEventFormatterHelpers(
-    [MSIECFCachedPathFormatterHelper, MSIECFHTTPHeadersventFormatterHelper]
+    [MSIECFCachedPathFormatterHelper, MSIECFHTTPHeadersEventFormatterHelper]
 )
diff --git a/tests/formatters/msiecf.py b/tests/formatters/msiecf.py
index 39ca799ae9..8c8bce57f3 100644
--- a/tests/formatters/msiecf.py
+++ b/tests/formatters/msiecf.py
@@ -30,12 +30,12 @@ def testFormatEventValues(self):
         self.assertNotIn("cached_file_path", event_values)
 
 
-class MSIECFHTTPHeadersventFormatterHelperTest(test_lib.EventFormatterTestCase):
+class MSIECFHTTPHeadersEventFormatterHelperTest(test_lib.EventFormatterTestCase):
     """Tests for the MSIE cache file HTTP headers formatter helper."""
 
     def testFormatEventValues(self):
         """Tests the FormatEventValues function."""
-        formatter_helper = msiecf.MSIECFHTTPHeadersventFormatterHelper()
+        formatter_helper = msiecf.MSIECFHTTPHeadersEventFormatterHelper()
 
         output_mediator = self._CreateOutputMediator()