diff --git a/core/modules/node/lib/Drupal/node/Entity/Node.php b/core/modules/node/lib/Drupal/node/Entity/Node.php
index 8ce1cfe..7caac4e 100644
--- a/core/modules/node/lib/Drupal/node/Entity/Node.php
+++ b/core/modules/node/lib/Drupal/node/Entity/Node.php
@@ -155,13 +155,13 @@ public static function preDelete(EntityStorageControllerInterface $storage_contr
     // Ensure that all nodes deleted are removed from the search index.
     if (\Drupal::moduleHandler()->moduleExists('search')) {
       foreach ($entities as $entity) {
-        search_reindex($entity->nid->value, 'node_search');
+        search_reindex($entity->id(), 'node_search');
       }
     }
 
     // Remove the node links.
     foreach ($entities as $entity) {
-      $nid = $entity->nid->value;
+      $nid = $entity->id();
       db_delete('node_links')
         ->condition('source_nid', $nid)
         ->execute();
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index db771de..48aafb7 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -2210,8 +2210,8 @@ function node_update_node_links($nid) {
       $href = $element->getAttribute('href');
       $to_nid = _determine_link_to_node($href, $language);
       if ($to_nid && $to_nid != $nid) {
-        // Record that we found a link. We only want to store one
-        // link to this node, and only if it's not a self-link.
+        // Record that we found a link. We only want to store one link to this
+        // node, and only if it's not a self-link.
         $links_found[$to_nid] = 1;
       }
     }
diff --git a/core/modules/views/lib/Drupal/views/Tests/SearchIntegrationTest.php b/core/modules/views/lib/Drupal/views/Tests/SearchIntegrationTest.php
index 6ebb6eb..e9ad147 100644
--- a/core/modules/views/lib/Drupal/views/Tests/SearchIntegrationTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/SearchIntegrationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\SearchIntegrationTest.
+ * Contains \Drupal\views\Tests\SearchIntegrationTest.
  */
 
 namespace Drupal\views\Tests;
@@ -49,10 +49,10 @@ public function testSearchIntegration() {
     $this->drupalCreateNode($node);
 
     $this->drupalGet('node/1');
-    $nodeURL = $this->getUrl();
+    $node_url = $this->getUrl();
 
     $node['title'] = 'sandwich';
-    $node['body'] = array(array('value' => 'sandwich with a <a href="' . $nodeURL . '">link to first node</a>'));
+    $node['body'] = array(array('value' => 'sandwich with a <a href="' . $node_url . '">link to first node</a>'));
     $this->drupalCreateNode($node);
 
     // Run cron so that the links and search index tables are updated.