diff --git a/src/Plugin/Derivative/FeedQueueWorker.php b/src/Plugin/Derivative/FeedQueueWorker.php
index 8ca8fa67..298d48cf 100644
--- a/src/Plugin/Derivative/FeedQueueWorker.php
+++ b/src/Plugin/Derivative/FeedQueueWorker.php
@@ -5,6 +5,7 @@ namespace Drupal\feeds\Plugin\Derivative;
 use Drupal\Component\Plugin\Derivative\DeriverBase;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -13,7 +14,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  * @see \Drupal\feeds\Plugin\QueueWorker\FeedRefresh
  */
 class FeedQueueWorker extends DeriverBase implements ContainerDeriverInterface {
-
+  use StringTranslationTrait;
   /**
    * The entity storage.
    *
@@ -45,7 +46,7 @@ class FeedQueueWorker extends DeriverBase implements ContainerDeriverInterface {
     $derivatives = [];
     foreach ($this->storage->loadMultiple() as $feed_type) {
       $derivatives[$feed_type->id()] = [
-        'title' => t('Feed refresh: @feed_type_label', [
+        'title' => $this->t('Feed refresh: @feed_type_label', [
           '@feed_type_label' => $feed_type->label(),
         ]),
       ] + $base_plugin_definition;
diff --git a/src/Plugin/Type/FeedsAnnotationFactory.php b/src/Plugin/Type/FeedsAnnotationFactory.php
index 4d3d7284..d32942d5 100644
--- a/src/Plugin/Type/FeedsAnnotationFactory.php
+++ b/src/Plugin/Type/FeedsAnnotationFactory.php
@@ -7,7 +7,8 @@ use Drupal\Core\Plugin\Factory\ContainerFactory;
 /**
  * Plugin factory which uses the plugin definition to find arguments.
  *
- * @deprecated in Feeds 8.x-3.0-alpha6, will be removed before Feeds 8.x-3.0.
+ * @deprecated in feeds:8.x-3.0-alpha6, and is removed from feeds:8.x-3.0. Implement \Drupal\Core\Plugin\ContainerFactoryPluginInterface instead.
+ * @see https://www.drupal.org/project/feeds/issues/3136615
  */
 class FeedsAnnotationFactory extends ContainerFactory {
 
@@ -21,7 +22,7 @@ class FeedsAnnotationFactory extends ContainerFactory {
       return parent::createInstance($plugin_id, $configuration);
     }
 
-    @trigger_error('FeedsAnnotationFactory is deprecated in Feeds 8.x-3.0-alpha6 and will be removed before Feeds 8.x-3.0. Implement \Drupal\Core\Plugin\ContainerFactoryPluginInterface instead.', E_USER_DEPRECATED);
+    @trigger_error('FeedsAnnotationFactory is deprecated in feeds:8.x-3.0-alpha6 and will be removed in feeds:8.x-3.0. Implement \Drupal\Core\Plugin\ContainerFactoryPluginInterface instead. See https://www.drupal.org/project/feeds/issues/3136615', E_USER_DEPRECATED);
 
     // Find arguments from the annotation.
     $arguments = [$configuration, $plugin_id, $definition];
diff --git a/src/Plugin/Field/FieldFormatter/FeedsItemGuidFormatter.php b/src/Plugin/Field/FieldFormatter/FeedsItemGuidFormatter.php
index 8da3e076..f874d0ee 100644
--- a/src/Plugin/Field/FieldFormatter/FeedsItemGuidFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/FeedsItemGuidFormatter.php
@@ -4,7 +4,6 @@ namespace Drupal\feeds\Plugin\Field\FieldFormatter;
 
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Url;
-use InvalidArgumentException;
 
 /**
  * Plugin implementation of the 'feeds_item_guid' formatter.
@@ -31,7 +30,7 @@ class FeedsItemGuidFormatter extends FeedsItemFormatterBase {
           $url = Url::fromUri($item->guid);
           $element[$delta] = $this->generateLink($url);
         }
-        catch (InvalidArgumentException $e) {
+        catch (\InvalidArgumentException $e) {
           // Value is not an url, render as plain text instead.
           $element[$delta] = ['#plain_text' => $item->guid];
         }
diff --git a/src/Plugin/Field/FieldFormatter/FeedsItemUrlFormatter.php b/src/Plugin/Field/FieldFormatter/FeedsItemUrlFormatter.php
index 45d2c3cc..8367fa0a 100644
--- a/src/Plugin/Field/FieldFormatter/FeedsItemUrlFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/FeedsItemUrlFormatter.php
@@ -6,7 +6,6 @@ use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
 use Drupal\feeds\FeedsItemInterface;
-use InvalidArgumentException;
 
 /**
  * Plugin implementation of the 'feeds_item_url' formatter.
@@ -74,7 +73,7 @@ class FeedsItemUrlFormatter extends FeedsItemFormatterBase {
         $url = $this->buildUrl($item);
         $element[$delta] = $this->generateLink($url);
       }
-      catch (InvalidArgumentException $e) {
+      catch (\InvalidArgumentException $e) {
         // Value is not an url, continue to next item.
         continue;
       }
diff --git a/src/Plugin/QueueWorker/FeedRefresh.php b/src/Plugin/QueueWorker/FeedRefresh.php
index 805ca8cc..9ff8db40 100644
--- a/src/Plugin/QueueWorker/FeedRefresh.php
+++ b/src/Plugin/QueueWorker/FeedRefresh.php
@@ -21,7 +21,7 @@ class FeedRefresh extends FeedQueueWorkerBase {
    * {@inheritdoc}
    */
   public function processItem($data) {
-    list($feed, $stage, $params) = $data;
+    [$feed, $stage, $params] = $data;
 
     if (!$feed instanceof FeedInterface) {
       return;