diff --git a/flag.tokens.inc b/flag.tokens.inc
index 1c5280e..1c78e18 100644
--- a/flag.tokens.inc
+++ b/flag.tokens.inc
@@ -191,6 +191,7 @@ function flag_tokens($type, $tokens, array $data, array $options, BubbleableMeta
  *   An associative array containing:
  *   - types: An array naming the types of tokens to show.
  *   - global_types: Whether to show global tokens.
+ * @return string
  */
 function theme_flag_tokens_browser(array $variables) {
   $types = $variables['types'];
diff --git a/src/ActionLinkPluginManager.php b/src/ActionLinkPluginManager.php
index 3dcaadb..ef98dbe 100644
--- a/src/ActionLinkPluginManager.php
+++ b/src/ActionLinkPluginManager.php
@@ -37,7 +37,7 @@ class ActionLinkPluginManager extends DefaultPluginManager {
   public function getAllLinkTypes() {
     $link_types = [];
     foreach ($this->getDefinitions() as $plugin_id => $plugin_def) {
-      $link_types[$plugin_id] = t($plugin_def['label']);
+      $link_types[$plugin_id] = t($plugin_def['label']->getUntranslatedString());
     }
 
     return $link_types;
diff --git a/src/Controller/FieldEntryFormController.php b/src/Controller/FieldEntryFormController.php
index 2f4ba26..f730bfc 100644
--- a/src/Controller/FieldEntryFormController.php
+++ b/src/Controller/FieldEntryFormController.php
@@ -31,8 +31,6 @@ class FieldEntryFormController extends ControllerBase {
    * @see \Drupal\flag\Plugin\ActionLink\AJAXactionLink
    */
   public function flag(FlagInterface $flag, $entity_id) {
-    $flag_id = $flag->id();
-
     $account = $this->currentUser();
 
     $flagging = $this->entityManager()->getStorage('flagging')->create([
diff --git a/src/Controller/FlagListBuilder.php b/src/Controller/FlagListBuilder.php
index 187d3ed..0d0beac 100644
--- a/src/Controller/FlagListBuilder.php
+++ b/src/Controller/FlagListBuilder.php
@@ -53,7 +53,7 @@ class FlagListBuilder extends ConfigEntityListBuilder {
     $out = implode(', ', $all_roles);
 
     if (empty($out)) {
-      return SafeMarkup::placeHolder($this->t('None'));
+      return SafeMarkup::format('%placeholder', ['%placeholder' => 'None']);
     }
 
     return rtrim($out, ', ');