diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeFieldMultilingualTestCase.php b/core/modules/node/lib/Drupal/node/Tests/NodeFieldMultilingualTestCase.php
index 6e66805..65cd547 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeFieldMultilingualTestCase.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeFieldMultilingualTestCase.php
@@ -133,7 +133,7 @@ function testMultilingualDisplaySettings() {
     // Check if node body is showed.
     $this->drupalGet('node/' . $node->id());
     $body = $this->xpath('//article[@class=:node-class]//div[@class=:content-class]/descendant::p', array(
-      ':node-class' => 'node-' . $node->nid,
+      ':node-class' => 'node-' . $node->id(),
       ':content-class' => 'content',
     ));
     $this->assertEqual(current($body), $node->body->value, 'Node body found.');
diff --git a/core/modules/node/templates/node.html.twig b/core/modules/node/templates/node.html.twig
index c3790ce..6439e1f 100644
--- a/core/modules/node/templates/node.html.twig
+++ b/core/modules/node/templates/node.html.twig
@@ -74,12 +74,12 @@
  * @ingroup themeable
  */
 #}
-<article class="node--{{ node.id }} {{ attributes.class }} clearfix"{{ attributes }} role="article">
+<article class="node--{{ node.id }} {{attributes.class}} "{{ attributes }} role="article">
 
   {{ title_prefix }}
   {% if not page %}
     <h2{{ title_attributes }}>
-      <a href="{{ url }}" rel="bookmark">{{ label }}</a>
+      <a href="{{ node.url }}" rel="bookmark">{{ label }}</a>
     </h2>
   {% endif %}
   {{ title_suffix }}
diff --git a/core/themes/bartik/templates/node.html.twig b/core/themes/bartik/templates/node.html.twig
index 481a434..b62105d 100644
--- a/core/themes/bartik/templates/node.html.twig
+++ b/core/themes/bartik/templates/node.html.twig
@@ -71,7 +71,7 @@
  * @ingroup themeable
  */
 #}
-<article class="node--{{ node.id }} {{ attributes.class}}" {{ attributes }} role="article">
+<article class="node--{{ node.id }} {{attributes.class}} "{{ attributes }} role="article">
 
   <header>
     {{ title_prefix }}