diff --git a/modules/quant_search/src/Form/QuantSearchPageForm.php b/modules/quant_search/src/Form/QuantSearchPageForm.php
index f4dc1ce7..35c2ab6c 100644
--- a/modules/quant_search/src/Form/QuantSearchPageForm.php
+++ b/modules/quant_search/src/Form/QuantSearchPageForm.php
@@ -16,6 +16,13 @@
  */
 class QuantSearchPageForm extends EntityForm {
 
+  /**
+   * The entity type manager.
+   *
+   * @var Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
   /**
    * Constructs a QuantSearchPageForm object.
    *
diff --git a/modules/quant_sitemap/src/EventSubscriber/CollectionSubscriber.php b/modules/quant_sitemap/src/EventSubscriber/CollectionSubscriber.php
index 53404690..74334676 100644
--- a/modules/quant_sitemap/src/EventSubscriber/CollectionSubscriber.php
+++ b/modules/quant_sitemap/src/EventSubscriber/CollectionSubscriber.php
@@ -23,6 +23,7 @@ class CollectionSubscriber implements EventSubscriberInterface {
    * The entity type manager.
    *
    * @var Drupal\Core\Entity\EntityTypeManager
+   * @todo Remove this?
    */
   protected $entityTypeManager;
 
diff --git a/src/EventSubscriber/NodeInsertSubscriber.php b/src/EventSubscriber/NodeInsertSubscriber.php
index 5d5a2904..ddea1c2e 100644
--- a/src/EventSubscriber/NodeInsertSubscriber.php
+++ b/src/EventSubscriber/NodeInsertSubscriber.php
@@ -12,6 +12,13 @@
  */
 class NodeInsertSubscriber implements EventSubscriberInterface {
 
+  /**
+   * The metadata manager.
+   *
+   * @var Drupal\quant\Plugin\QuantMetadataManager
+   */
+  protected $metadataManager;
+
   /**
    * Constructs a node insertion event object.
    *
diff --git a/src/Plugin/QueueItem/FileItem.php b/src/Plugin/QueueItem/FileItem.php
index 08d0ca81..6b092b3a 100644
--- a/src/Plugin/QueueItem/FileItem.php
+++ b/src/Plugin/QueueItem/FileItem.php
@@ -12,12 +12,26 @@
 class FileItem implements QuantQueueItemInterface {
 
   /**
-   * A filepath.
+   * The file path.
    *
    * @var string
    */
   private $file;
 
+  /**
+   * The file URL.
+   *
+   * @var string
+   */
+  private $url;
+
+  /**
+   * The file full path.
+   *
+   * @var string
+   */
+  private $fullPath;
+
   /**
    * {@inheritdoc}
    */
diff --git a/src/Plugin/QueueItem/NodeItem.php b/src/Plugin/QueueItem/NodeItem.php
index c56c6b4a..3aa580ff 100644
--- a/src/Plugin/QueueItem/NodeItem.php
+++ b/src/Plugin/QueueItem/NodeItem.php
@@ -12,12 +12,19 @@
 class NodeItem implements QuantQueueItemInterface {
 
   /**
-   * A Drupal entity.
+   * The entity id.
    *
    * @var int
    */
   private $id;
 
+  /**
+   * The revision id.
+   *
+   * @var int
+   */
+  private $vid;
+
   /**
    * The language code for the entity.
    *
@@ -25,11 +32,11 @@ class NodeItem implements QuantQueueItemInterface {
    */
   private $filter;
 
-
   /**
    * Include entity revisions.
    *
    * @var bool
+   * @todo Remove this?
    */
   private $revisions;