diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 81323d5..91b6979 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -413,6 +413,7 @@ function comment_permission() {
   if (module_exists('translation_entity') && translation_entity_enabled('comment')) {
     $permissions['translate comments'] = array(
       'title' => t('Translate comments'),
+      'description' => t('Role requires pemission <em>create translations</em>, <em>edit translations</em> or <em>delete translations</em>.'),
     );
   }
 
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentTranslationUITest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentTranslationUITest.php
index 97614b4..4425dae 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentTranslationUITest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentTranslationUITest.php
@@ -34,9 +34,6 @@ public static function getInfo() {
     );
   }
 
-  /**
-   * Overrides \Drupal\simpletest\WebTestBase::setUp().
-   */
   function setUp() {
     $this->entityType = 'comment';
     $this->nodeBundle = 'article';
diff --git a/core/modules/node/lib/Drupal/node/NodeFormController.php b/core/modules/node/lib/Drupal/node/NodeFormController.php
index 0b892eb..6b97015 100644
--- a/core/modules/node/lib/Drupal/node/NodeFormController.php
+++ b/core/modules/node/lib/Drupal/node/NodeFormController.php
@@ -346,6 +346,7 @@ public function submit(array $form, array &$form_state) {
    */
   public function preview(array $form, array &$form_state) {
     drupal_set_title(t('Preview'), PASS_THROUGH);
+    module_load_include('inc', 'node', 'node.pages');
     $form_state['node_preview'] = node_preview($this->getEntity($form_state));
     $form_state['rebuild'] = TRUE;
   }
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php b/core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php
index ace60da..004a2d1 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php
@@ -34,9 +34,6 @@ public static function getInfo() {
     );
   }
 
-  /**
-   * Overrides \Drupal\simpletest\WebTestBase::setUp().
-   */
   function setUp() {
     $this->entityType = 'node';
     $this->bundle = 'article';
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 3b50339..de88688 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -2884,6 +2884,7 @@ function node_list_permissions($type) {
   if (module_exists('translation_entity') && translation_entity_enabled('node', $type->type)) {
     $perms["translate any $type->type content"] = array(
       'title' => t('%type_name: Translate any content', array('%type_name' => $type->name)),
+      'description' => t('Role requires pemission <em>create translations</em>, <em>edit translations</em> or <em>delete translations</em>.'),
     );
   }
 
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermTranslationController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/TermTranslationController.php
index 7751097..f65c096 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/TermTranslationController.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/TermTranslationController.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\taxonomy;
 
-use Drupal\taxonomy\Plugin\Core\Entity\Term;
-
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\translation_entity\EntityTranslationController;
 
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTranslationUITest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTranslationUITest.php
index 9c7ee00..829d8da 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTranslationUITest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTranslationUITest.php
@@ -41,9 +41,6 @@ public static function getInfo() {
     );
   }
 
-  /**
-   * Overrides \Drupal\simpletest\WebTestBase::setUp().
-   */
   function setUp() {
     $this->entityType = 'taxonomy_term';
     $this->bundle = 'tags';
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index ea0701d..d9ffbfa 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -105,6 +105,7 @@ function taxonomy_permission() {
       $permissions += array(
          'translate terms in ' . $vocabulary->vid => array(
            'title' => t('Translate terms from %vocabulary', array('%vocabulary' => $vocabulary->name)),
+           'description' => t('Role requires pemission <em>create translations</em>, <em>edit translations</em> or <em>delete translations</em>.'),
         ),
       );
     }
diff --git a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/ConfigTestTranslationUITest.php b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/ConfigTestTranslationUITest.php
index 7b3ce23..2439c8b 100644
--- a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/ConfigTestTranslationUITest.php
+++ b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/ConfigTestTranslationUITest.php
@@ -29,9 +29,6 @@ public static function getInfo() {
     );
   }
 
-  /**
-   * Overrides \Drupal\simpletest\WebTestBase::setUp().
-   */
   function setUp() {
     $this->entityType = 'config_test';
     parent::setUp();
diff --git a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationTestBase.php b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationTestBase.php
index 25291ac..0ffb308 100644
--- a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationTestBase.php
+++ b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationTestBase.php
@@ -71,9 +71,6 @@
    */
   protected $controller;
 
-  /**
-   * Overrides \Drupal\simpletest\WebTestBase::setUp().
-   */
   function setUp() {
     parent::setUp();
 
diff --git a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationWorkflowsTest.php b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationWorkflowsTest.php
index 156332b..03db771 100644
--- a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationWorkflowsTest.php
+++ b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationWorkflowsTest.php
@@ -36,9 +36,6 @@ public static function getInfo() {
     );
   }
 
-  /**
-   * Overrides \Drupal\simpletest\WebTestBase::setUp().
-   */
   function setUp() {
     parent::setUp();
     $this->setupEntity();
diff --git a/core/modules/translation_entity/translation_entity.module b/core/modules/translation_entity/translation_entity.module
index e8a74f4..74e8095 100644
--- a/core/modules/translation_entity/translation_entity.module
+++ b/core/modules/translation_entity/translation_entity.module
@@ -462,12 +462,15 @@ function translation_entity_permission() {
     ),
     'create entity translations' => array(
       'title' => t('Create translations'),
+      'description' => t('Role may require additional <em>translate</em> permissions for the entity type in question.'),
     ),
     'update entity translations' => array(
       'title' => t('Edit translations'),
+      'description' => t('Role may require additional <em>translate</em> permissions for the entity type in question.'),
     ),
     'delete entity translations' => array(
       'title' => t('Delete translations'),
+      'description' => t('Role may require additional <em>translate</em> permissions for the entity type in question.'),
     ),
   );
 }
diff --git a/core/modules/translation_entity/translation_entity.pages.inc b/core/modules/translation_entity/translation_entity.pages.inc
index 062f194..c637e08 100644
--- a/core/modules/translation_entity/translation_entity.pages.inc
+++ b/core/modules/translation_entity/translation_entity.pages.inc
@@ -228,6 +228,7 @@ function translation_entity_edit_page(EntityInterface $entity, Language $languag
   $form_id = entity_form_id($entity);
   return drupal_build_form($form_id, $form_state);
 }
+
 /**
  * Populates target values with the source values.
  *
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserTranslationUITest.php b/core/modules/user/lib/Drupal/user/Tests/UserTranslationUITest.php
index 72ffcaa..3b97557 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserTranslationUITest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserTranslationUITest.php
@@ -34,9 +34,6 @@ public static function getInfo() {
     );
   }
 
-  /**
-   * Overrides \Drupal\simpletest\WebTestBase::setUp().
-   */
   function setUp() {
     $this->entityType = 'user';
     $this->testLanguageSelector = FALSE;