diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index 85b57db..7e383b5 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -17,6 +17,7 @@
  * Implements hook_help().
  */
 function aggregator_help($path, $arg) {
+  debug($path);
   switch ($path) {
     case 'admin/help#aggregator':
       $output = '';
diff --git a/core/modules/contact/contact.routing.yml b/core/modules/contact/contact.routing.yml
index c616c25..9b2da2f 100644
--- a/core/modules/contact/contact.routing.yml
+++ b/core/modules/contact/contact.routing.yml
@@ -17,6 +17,7 @@ contact.category_add:
   path: '/admin/structure/contact/add'
   defaults:
     _entity_form: contact_category.add
+    _title: 'Add category'
   requirements:
     _permission: 'administer contact forms'
 
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php
index 48ad76f..f1df494 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php
@@ -91,13 +91,13 @@ public function access() {
    */
   protected function getActiveHelp(Request $request) {
     $output = '';
-    $router_path = menu_tab_root_path();
+    $router_path = $request->attributes->get('_system_path');
     // We will always have a path unless we are on a 403 or 404.
     if (!$router_path) {
       return '';
     }
 
-    $arg = drupal_help_arg(explode('/', $request->attributes->get('_system_path')));
+    $arg = drupal_help_arg(explode('/', $router_path));
 
     foreach ($this->moduleHandler->getImplementations('help') as $module) {
       $function = $module . '_help';
diff --git a/core/modules/taxonomy/taxonomy.local_actions.yml b/core/modules/taxonomy/taxonomy.local_actions.yml
index bf23551..689754a 100644
--- a/core/modules/taxonomy/taxonomy.local_actions.yml
+++ b/core/modules/taxonomy/taxonomy.local_actions.yml
@@ -5,7 +5,7 @@ taxonomy_add_vocabulary_local_action:
     - taxonomy.vocabulary_list
 
 taxonomy.term_add:
-  route_name: taxonom.term_add
+  route_name: taxonomy.term_add
   title: 'Add term'
   appears_on:
     - taxonomy.overview_terms