diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 4fddfe8..1648974 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -1055,8 +1055,8 @@ function template_preprocess_forum_list(&$variables) {
   $row = 0;
   // Sanitize each forum so that the template can safely print the data.
   foreach ($variables['forums'] as $id => $forum) {
-    $variables['forums'][$id]->description = check_markup($forum->description->value, $forum->format->value);
-    $variables['forums'][$id]->link = url('forum/' . $forum->id());
+    $variables['forums'][$id]->description = filter_xss_admin($forum->description->value);
+    $variables['forums'][$id]->link = url("forum/" . $forum->id());
     $variables['forums'][$id]->name = check_plain($forum->label());
     $variables['forums'][$id]->is_container = !empty($forum->container);
     $variables['forums'][$id]->zebra = $row % 2 == 0 ? 'odd' : 'even';
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
index 4dd80cd..744fd34 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
@@ -46,7 +46,7 @@ public function form(array $form, array &$form_state, EntityInterface $term) {
       '#type' => 'language_select',
       '#title' => t('Language'),
       '#languages' => LANGUAGE_ALL,
-      '#default_value' => $term->language()->langcode,
+      '#default_value' => $term->langcode->value,
       '#access' => !is_null($language_configuration['language_show']) && $language_configuration['language_show'],
     );