diff --git a/core/lib/Drupal/Core/Routing/NullGenerator.php b/core/lib/Drupal/Core/Routing/NullGenerator.php
index ca05d3e..f78ce63 100644
--- a/core/lib/Drupal/Core/Routing/NullGenerator.php
+++ b/core/lib/Drupal/Core/Routing/NullGenerator.php
@@ -38,10 +38,10 @@ protected function getRoute($name) {
     if ($name === '<front>') {
       return new Route('/');
     }
-    elseif ($name == '<current>') {
+    elseif ($name === '<current>') {
       return new Route($this->requestStack->getCurrentRequest()->getPathInfo());
     }
-    elseif ($name == '<none>') {
+    elseif ($name === '<none>') {
       return new Route('');
     }
     throw new RouteNotFoundException();
diff --git a/core/modules/update/update.module b/core/modules/update/update.module
index a68bff2..542e0c5 100644
--- a/core/modules/update/update.module
+++ b/core/modules/update/update.module
@@ -123,7 +123,6 @@ function update_page_top() {
     $route_name = \Drupal::routeMatch()->getRouteName();
     switch ($route_name) {
       // These pages don't need additional nagging.
-      // @todo find out the corresponding route for that.
       case 'update.theme_update':
       case 'system.theme_install':
       case 'update.module_update':
diff --git a/core/modules/views/js/base.js b/core/modules/views/js/base.js
index 69fd6a3..d28b21d 100644
--- a/core/modules/views/js/base.js
+++ b/core/modules/views/js/base.js
@@ -62,7 +62,7 @@
    */
   Drupal.Views.getPath = function (href) {
     href = Drupal.Views.pathPortion(href);
-    href = href.substring(drupalSettings.path.baseUrl, href.length);
+    href = href.substring(drupalSettings.path.baseUrl.length, href.length);
     // 3 is the length of the '?q=' added to the url without clean urls.
     if (href.substring(0, 3) === '?q=') {
       href = href.substring(3, href.length);