diff --git a/src/Controller/NodeRevisionController.php b/src/Controller/NodeRevisionController.php
index 46e26be..07b674d 100644
--- a/src/Controller/NodeRevisionController.php
+++ b/src/Controller/NodeRevisionController.php
@@ -110,7 +110,9 @@ class NodeRevisionController extends EntityComparisonBase {
         foreach ($field_diff_rows as &$field_diff_row) {
           foreach ($field_diff_row as &$field_diff_column) {
             if (is_array($field_diff_column)) {
-              $field_diff_column['data'] = SafeMarkup::set($field_diff_column['data']);
+              if (isset($field_diff_column['data']['#markup'])) {
+                $field_diff_column['data']['#markup'] = SafeMarkup::set($field_diff_column['data']['#markup']);
+              }
             }
             else {
               $field_diff_column = SafeMarkup::set($field_diff_column);
diff --git a/src/Form/RevisionOverviewForm.php b/src/Form/RevisionOverviewForm.php
index 112930c..532af3b 100755
--- a/src/Form/RevisionOverviewForm.php
+++ b/src/Form/RevisionOverviewForm.php
@@ -180,7 +180,7 @@ class RevisionOverviewForm extends FormBase {
               '#markup' => $date_username_markup . $revision_log,
             ),
             'operations' => array(
-              '#markup' => SafeMarkup::placeholder($this->t('current revision')),
+              '#markup' => SafeMarkup::format('%placeholder', array('%placeholder' => $this->t('current revision'))),
             ),
             '#attributes' => array(
               'class' => array('revision-current'),
diff --git a/src/Tests/DiffRevisionTest.php b/src/Tests/DiffRevisionTest.php
index 9cf4e6f..f8b9fc0 100644
--- a/src/Tests/DiffRevisionTest.php
+++ b/src/Tests/DiffRevisionTest.php
@@ -25,13 +25,14 @@ class DiffRevisionTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'diff', 'diff_test');
+  public static $modules = array('node', 'diff', 'diff_test', 'block');
 
   /**
    * Tests the revision diff overview.
    */
   public function testRevisionDiffOverview() {
-
+    $this->drupalPlaceBlock('local_tasks_block');
+    $this->drupalPlaceBlock('local_actions_block');
     $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
 
     $admin_user = $this->drupalCreateUser(array(
@@ -123,7 +124,7 @@ class DiffRevisionTest extends WebTestBase {
     $this->assertText(t('Copy of the revision from @date', array('@date' => date('D, m/d/Y - H:i', $created))));
 
     // Delete the first revision (last entry in table).
-    $this->clickLink(t('Delete'), 2);
+    $this->clickLink(t('Delete'), 0);
     $this->drupalPostForm(NULL, NULL, t('Delete'));
     $this->assertText(t('Revision from @date of Article @title has been deleted.', array(
       '@date' => date('D, m/d/Y - H:i', $created),
@@ -135,7 +136,7 @@ class DiffRevisionTest extends WebTestBase {
     $this->assertEqual(count($rows), 2);
 
     // Delete one revision so that we are left with only 1 revision.
-    $this->clickLink(t('Delete'), 1);
+    $this->clickLink(t('Delete'), 0);
     $this->drupalPostForm(NULL, NULL, t('Delete'));
     $this->assertText(t('Revision from @date of Article @title has been deleted.', array(
         '@date' => date('D, m/d/Y - H:i', $created),