diff --git a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
index 685039c..07043ec 100644
--- a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
+++ b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
@@ -143,7 +143,8 @@ public function buildContent(array $entities, array $displays, $view_mode, $lang
    */
   protected function getBuildDefaults(EntityInterface $entity, $view_mode, $langcode) {
     // Allow modules to change the view mode.
-    $this->moduleHandler->alter('entity_view_mode', $view_mode, $entity, array('langcode' => $langcode));
+    $context = array('langcode' => $langcode);
+    $this->moduleHandler->alter('entity_view_mode', $view_mode, $entity, $context);
 
     $return = array(
       '#theme' => $this->entityTypeId,
diff --git a/core/modules/node/lib/Drupal/node/NodeViewBuilder.php b/core/modules/node/lib/Drupal/node/NodeViewBuilder.php
index 7fac01f..d266251 100644
--- a/core/modules/node/lib/Drupal/node/NodeViewBuilder.php
+++ b/core/modules/node/lib/Drupal/node/NodeViewBuilder.php
@@ -40,7 +40,7 @@ public function buildContent(array $entities, array $displays, $view_mode, $lang
         'view_mode' => $view_mode,
         'langcode' => $langcode,
         'in_preview' => !empty($entity->in_preview),
-        'token' => drupal_render_cache_generate_placeholder(),
+        'token' => drupal_render_cache_generate_token(),
       );
 
       $entity->content['links'] = array(