diff --git a/artifactsrc/volume_scanner.py b/artifactsrc/volume_scanner.py
index ea91ee9..4584fc1 100644
--- a/artifactsrc/volume_scanner.py
+++ b/artifactsrc/volume_scanner.py
@@ -62,7 +62,7 @@ class ArtifactDefinitionsVolumeScanner(dfvfs_volume_scanner.VolumeScanner):
   }
 
   def __init__(self, artifacts_registry, mediator=None):
-    """Initializes a Windows Registry collector.
+    """Initializes an artifact definitions volume scanner.
 
     Args:
       artifacts_registry (artifacts.ArtifactDefinitionsRegistry): artifact
@@ -96,7 +96,7 @@ def _DetermineDataFormat(self, names, file_object):
       file_object (file): file-like object.
 
     Returns:
-      str: data format identifier or None if the data format coudld not
+      str: data format identifier or None if the data format could not
           be determined.
     """
     for name in names:
diff --git a/setup.py b/setup.py
index e3f472a..ed2f984 100755
--- a/setup.py
+++ b/setup.py
@@ -235,6 +235,11 @@ def parse_requirements_from_file(path):
     package_dir={
         'artifactsrc': 'artifactsrc'
     },
+    include_package_data=True,
+    package_data={
+        'artifactsrc': ['*.yaml']
+    },
+    zip_safe=False,
     scripts=glob.glob(os.path.join('tools', '[a-z]*.py')),
     data_files=[
         ('share/artifacts-kb/data', glob.glob(
diff --git a/tools/check_artifacts.py b/tools/check_artifacts.py
index ce7728f..0d0daf3 100755
--- a/tools/check_artifacts.py
+++ b/tools/check_artifacts.py
@@ -12,9 +12,9 @@
 
 from dfimagetools import helpers as dfimagetools_helpers
 
-from dfvfs.helpers import command_line
+from dfvfs.helpers import command_line as dfvfs_command_line
 from dfvfs.helpers import volume_scanner as dfvfs_volume_scanner
-from dfvfs.lib import errors
+from dfvfs.lib import errors as dfvfs_errors
 
 from artifactsrc import volume_scanner
 
@@ -103,7 +103,7 @@ def Main():
   elif os.path.isfile(options.artifact_definitions):
     registry.ReadFromFile(reader, options.artifact_definitions)
 
-  mediator = command_line.CLIVolumeScannerMediator()
+  mediator = dfvfs_command_line.CLIVolumeScannerMediator()
   scanner = volume_scanner.ArtifactDefinitionsVolumeScanner(
       registry, mediator=mediator)
 
@@ -134,7 +134,7 @@ def Main():
       if check_result.number_of_file_entries:
         definitions_with_check_results[artifact_definition.name] = check_result
 
-  except errors.ScannerError as exception:
+  except dfvfs_errors.ScannerError as exception:
     print('[ERROR] {0!s}'.format(exception), file=sys.stderr)
     print('')
     return False