diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
index 77df361..1b1c706 100644
--- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -736,7 +736,7 @@ public function buildOverviewForm(array $form, FormStateInterface $form_state) {
       $form['upgrade_option_item'] = [
         '#type' => 'item',
         '#prefix' => $this->t('An upgrade has already been performed on this site. To perform a new migration, create a clean and empty new install of Drupal 8. Rollbacks and incremental migrations are not yet supported through the user interface. For more information, see the <a href=":url">upgrading handbook</a>.', [':url' => 'https://www.drupal.org/upgrade/migrate']),
-        '#description' => $this->t('<p>Last upgrade: @date</p>', ['@date' => $this->dateFormatter->format($date_performed)]),
+        '#description' => '<p>' . $this->t('Last upgrade: @date', ['@date' => $this->dateFormatter->format($date_performed)]) . '</p>',
       ];
       return $form;
     }
@@ -933,7 +933,7 @@ public function validateCredentialForm(array &$form, FormStateInterface $form_st
         $this->createDatabaseStateSettings($database, $version);
         $migrations = $this->getMigrations('migrate_drupal_' . $version, $version);
 
-        // Get the system data from source database.
+        // Get the system data fqrom source database.
         $system_data = $this->getSystemData($connection);
 
         // Convert the migration object into array
@@ -953,16 +953,10 @@ public function validateCredentialForm(array &$form, FormStateInterface $form_st
     }
     catch (\Exception $e) {
       $error_message = [
-        '#type' => 'inline_template',
-        '#template' => '{% trans %}Resolve the issue below to continue the upgrade.{% endtrans%}{{ errors }}',
-        '#context' => [
-          'errors' => [
-            '#theme' => 'item_list',
-            '#items' => [$e->getMessage()],
-          ],
-        ],
+        '#title' => $this->t('Resolve the issue below to continue the upgrade.'),
+        '#theme' => 'item_list',
+        '#items' => [$e->getMessage()],
       ];
-
       $form_state->setErrorByName($database['driver'] . '][0', $this->renderer->renderPlain($error_message));
     }
   }
@@ -1075,8 +1069,11 @@ public function buildConfirmForm(array $form, FormStateInterface $form_state) {
       ];
     }
     $form['counts'] = [
-      '#type' => 'item',
-      '#title' => '<ul><li>' . $this->t('@count available upgrade paths', ['@count' => $available_count]) . '</li><li>' . $this->t('@count missing upgrade paths', ['@count' => $missing_count]) . '</li></ul>',
+      '#theme' => 'item_list',
+      '#items' => [
+        $this->t('@count available upgrade paths', ['@count' => $available_count]),
+        $this->t('@count missing upgrade paths', ['@count' => $missing_count]),
+      ],
       '#weight' => -15,
     ];
 
@@ -1145,7 +1142,7 @@ public function getCancelUrl() {
    * {@inheritdoc}
    */
   public function getDescription() {
-    return $this->t('<p><strong>Upgrade analysis report</strong></p>');
+    return '<p><strong>' . $this->t('Upgrade analysis report') . '</strong></p>';
   }
 
   /**