diff --git a/src/Controller/NodeRevisionController.php b/src/Controller/NodeRevisionController.php
index 46e26be..53e2794 100644
--- a/src/Controller/NodeRevisionController.php
+++ b/src/Controller/NodeRevisionController.php
@@ -200,8 +200,8 @@ class NodeRevisionController extends EntityComparisonBase {
         '#account' => $revision->uid->entity,
       );
       $revision_date = $this->date->format($revision->getRevisionCreationTime(), 'short');
-      $revision_link = $this->t($revision_log . '!date', array(
-        '!date' => $this->l($revision_date, Url::fromRoute('entity.node.revision', array(
+      $revision_link = $this->t($revision_log . '@date', array(
+        '@date' => $this->l($revision_date, Url::fromRoute('entity.node.revision', array(
           'node' => $revision->id(),
           'node_revision' => $revision->getRevisionId(),
         ))),
@@ -214,11 +214,11 @@ class NodeRevisionController extends EntityComparisonBase {
       //   'colspan' => 1,
       // );
       $header[] = array(
-        'data' => $this->nonBreakingSpace,
+        'data' => array('#markup' => $this->nonBreakingSpace),
         'colspan' => 1,
       );
       $header[] = array(
-        'data' => $revision_link,
+        'data' => array('#markup' => $revision_link),
         'colspan' => 1,
       );
     }
diff --git a/src/EntityComparisonBase.php b/src/EntityComparisonBase.php
index 3b278f9..cf85af5 100644
--- a/src/EntityComparisonBase.php
+++ b/src/EntityComparisonBase.php
@@ -15,8 +15,8 @@ use Drupal\Core\Render\Element;
 use Drupal\Component\Diff\Diff;
 use Drupal\Core\Datetime\DateFormatter;
 use Drupal\Component\Utility\Xss;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Mail\MailFormatHelper;
+use Drupal\Component\Utility\SafeMarkup;
 
 /**
  * Builds an array of data out of entity fields.
@@ -83,7 +83,7 @@ class EntityComparisonBase extends ControllerBase {
     $this->fieldTypeDefinitions = $plugin_manager->getDefinitions();
     $this->config = $this->config('diff.settings');
     $this->pluginsConfig = $this->config('diff.plugins');
-    $this->nonBreakingSpace = SafeMarkup::set('&nbsp');
+    $this->nonBreakingSpace = SafeMarkup::format('&nbsp', array());
     $this->entityParser = $entityParser;
   }