diff --git a/core/modules/forum/lib/Drupal/forum/Form/Overview.php b/core/modules/forum/lib/Drupal/forum/Form/Overview.php
index 12361f2..e3f9e07 100644
--- a/core/modules/forum/lib/Drupal/forum/Form/Overview.php
+++ b/core/modules/forum/lib/Drupal/forum/Form/Overview.php
@@ -68,7 +68,7 @@ public function getFormID() {
    * {@inheritdoc}
    */
   public function buildForm(array $form, array &$form_state) {
-    $forum_config = $this->ConfigFactory->get('forum.settings');
+    $forum_config = $this->configFactory->get('forum.settings');
     $vid = $forum_config->get('vocabulary');
     $vocabulary = $this->entityManager->getStorageController('taxonomy_vocabulary')->load($vid);
     if (!$vocabulary) {
@@ -79,7 +79,7 @@ public function buildForm(array $form, array &$form_state) {
     $form = parent::buildForm($form, $form_state, $vocabulary);
 
     $containers = $forum_config->get('containers');
-    foreach (element_children($form) as $key) {
+    foreach (element_children($form['terms']) as $key) {
       if (isset($form['terms'][$key]['#term'])) {
         $term = $form['terms'][$key]['#term'];
         $form['terms'][$key]['term']['#href'] = 'forum/' . $term->id();
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
index f885f52..0b1b519 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
@@ -23,7 +23,7 @@ class OverviewTerms extends FormBase {
    *
    * @var \Drupal\Core\Config\Config
    */
-  protected $config;
+  protected $configFactory;
 
   /**
    * The module handler service.