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/FlagListBuilder.php b/src/Controller/FlagListBuilder.php
index 187d3ed..c7a3399 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', $args = ['%placeholder' => 'None']);
     }
 
     return rtrim($out, ', ');