diff --git a/src/Controller/AJAXLinkController.php b/src/Controller/AJAXLinkController.php
index 12f194d..754b506 100644
--- a/src/Controller/AJAXLinkController.php
+++ b/src/Controller/AJAXLinkController.php
@@ -23,7 +23,7 @@ class AJAXLinkController extends ControllerBase {
    * This method is invoked when a user clicks an AJAX flagging link provided
    * by the AJAXactionLink plugin.
    *
-   * @param FlagInterface $flag
+   * @param \Drupal\flag\FlagInterface $flag
    *   The flag entity.
    * @param int $entity_id
    *   The flaggable ID.
@@ -50,7 +50,7 @@ class AJAXLinkController extends ControllerBase {
    * This method is invoked when a user clicks an AJAX unflagging link provided
    * by the AJAXactionLink plugin.
    *
-   * @param FlagInterface $flag
+   * @param \Drupal\flag\FlagInterface $flag
    *   The flag entity.
    * @param int $entity_id
    *   The entity ID to unflag.
diff --git a/src/Controller/FieldEntryFormController.php b/src/Controller/FieldEntryFormController.php
index 2dd2848..bbc5c1f 100644
--- a/src/Controller/FieldEntryFormController.php
+++ b/src/Controller/FieldEntryFormController.php
@@ -19,7 +19,7 @@ class FieldEntryFormController extends ControllerBase {
   /**
    * Performs a flagging when called via a route.
    *
-   * @param FlagInterface $flag
+   * @param \Drupal\flag\FlagInterface $flag
    *   The flag entity.
    * @param int $entity_id
    *   The flaggable ID.
@@ -49,7 +49,7 @@ class FieldEntryFormController extends ControllerBase {
   /**
    * Return the flagging edit form.
    *
-   * @param FlagInterface $flag
+   * @param \Drupal\flag\FlagInterface $flag
    *   The flag entity.
    * @param mixed $entity_id
    *   The entity ID.
@@ -89,7 +89,7 @@ class FieldEntryFormController extends ControllerBase {
   /**
    * Title callback when creating a new flagging.
    *
-   * @param FlagInterface $flag
+   * @param \Drupal\flag\FlagInterface $flag
    *   The flag entity.
    * @param int $entity_id
    *   The entity ID to unflag.
@@ -98,7 +98,6 @@ class FieldEntryFormController extends ControllerBase {
    *   The flag field entry form title.
    */
   public function flagTitle(FlagInterface $flag, $entity_id) {
-    //$flag = \Drupal::service('flag')->getFlagById($flag_id);
     $link_type = $flag->getLinkTypePlugin();
     return $link_type->getFlagQuestion();
   }
@@ -106,7 +105,7 @@ class FieldEntryFormController extends ControllerBase {
   /**
    * Title callback when editing an existing flagging.
    *
-   * @param FlagInterface $flag
+   * @param \Drupal\flag\FlagInterface $flag
    *   The flag entity.
    * @param int $entity_id
    *   The entity ID to unflag.
@@ -115,7 +114,6 @@ class FieldEntryFormController extends ControllerBase {
    *   The flag field entry form title.
    */
   public function editTitle(FlagInterface $flag, $entity_id) {
-    //$flag = \Drupal::service('flag')->getFlagById($flag_id);
     $link_type = $flag->getLinkTypePlugin();
     return $link_type->getEditFlaggingTitle();
   }
diff --git a/src/Controller/ReloadLinkController.php b/src/Controller/ReloadLinkController.php
index ecd20f5..2d41e42 100644
--- a/src/Controller/ReloadLinkController.php
+++ b/src/Controller/ReloadLinkController.php
@@ -53,7 +53,7 @@ class ReloadLinkController extends ControllerBase implements ContainerInjectionI
   /**
    * Performs a flagging when called via a route.
    *
-   * @param FlagInterface $flag
+   * @param \Drupal\flag\FlagInterface $flag
    *   The flag entity.
    * @param int $entity_id
    *   The flaggable ID.
@@ -78,7 +78,7 @@ class ReloadLinkController extends ControllerBase implements ContainerInjectionI
   /**
    * Performs a flagging when called via a route.
    *
-   * @param FlagInterface $flag
+   * @param \Drupal\flag\FlagInterface $flag
    *   The flag entity.
    * @param int $entity_id
    *   The flagging ID.
diff --git a/src/FlaggingAccessController.php b/src/FlaggingAccessController.php
index 3ae2c8d..7fdb8dd 100644
--- a/src/FlaggingAccessController.php
+++ b/src/FlaggingAccessController.php
@@ -19,8 +19,8 @@ class FlaggingAccessController extends ControllerBase {
   /**
    * Checks flagging permission.
    *
-   * @param FlagInterface $flag
-   *   The flag identifier.
+   * @param \Drupal\flag\FlagInterface $flag
+   *   The flag entity.
    *
    * @return \Drupal\Core\Access\AccessResult
    *   Returns indication value for flagging access permission.
@@ -32,8 +32,8 @@ class FlaggingAccessController extends ControllerBase {
   /**
    * Checks unflagging permission.
    *
-   * @param FlagInterface $flag
-   *   The flag identifier.
+   * @param \Drupal\flag\FlagInterface $flag
+   *   The flag entity.
    *
    * @return \Drupal\Core\Access\AccessResult
    *   Returns indication value for unflagging access permission.
diff --git a/src/Form/FlaggingConfirmForm.php b/src/Form/FlaggingConfirmForm.php
index b9713b9..2ce079c 100644
--- a/src/Form/FlaggingConfirmForm.php
+++ b/src/Form/FlaggingConfirmForm.php
@@ -39,7 +39,6 @@ class FlaggingConfirmForm extends ConfirmFormBase {
                             FlagInterface $flag = NULL, $entity_id = NULL) {
 
     $this->flag = $flag;
-    $flag_id = $flag->id();
     $flag_service = \Drupal::service('flag');
     $this->entity = $flag_service->getFlaggableById($this->flag, $entity_id);
     return parent::buildForm($form, $form_state);