diff --git a/core/authorize.php b/core/authorize.php
index 6bb8a66..35277f6 100644
--- a/core/authorize.php
+++ b/core/authorize.php
@@ -123,14 +123,10 @@ function authorize_access_allowed(Request $request) {
       $links += $results['tasks'];
     }
     else {
-      $front_url = Url::fromRoute('<front>')
-                      ->setOption('base_url', $GLOBALS['base_url']);
-      $admin_url = Url::fromRoute('system.admin')
-                      ->setOption('base_url', $GLOBALS['base_url']);
-      $links = array_merge($links, [
-        ['#markup' => \Drupal::l(t('Administration pages'), $admin_url)],
-        ['#markup' => \Drupal::l(t('Front page'), $front_url)],
-      ]);
+      $links = array_merge($links, array(
+        \Drupal::l(t('Administration pages'), new Url('system.admin')),
+        \Drupal::l(t('Front page'), new Url('<front>')),
+      ));
     }
 
     $content['next_steps'] = array(
diff --git a/core/lib/Drupal/Core/Updater/Module.php b/core/lib/Drupal/Core/Updater/Module.php
index 9e6c396..06e1c1e 100644
--- a/core/lib/Drupal/Core/Updater/Module.php
+++ b/core/lib/Drupal/Core/Updater/Module.php
@@ -99,17 +99,11 @@ public function getSchemaUpdates() {
    * Overrides Drupal\Core\Updater\Updater::postInstallTasks().
    */
   public function postInstallTasks() {
-    $admin_url = Url::fromRoute('system.admin')
-                    ->setOption('base_url', $GLOBALS['base_url']);
-    $list_url = Url::fromRoute('system.modules_list')
-                   ->setOption('base_url', $GLOBALS['base_url']);
-    $install_url = Url::fromRoute('update.module_install')
-                      ->setOption('base_url', $GLOBALS['base_url']);
-    return [
-      ['#markup' => \Drupal::l(t('Install another module'), $install_url)],
-      ['#markup' => \Drupal::l(t('Enable newly added modules'), $list_url)],
-      ['#markup' => \Drupal::l(t('Administration pages'), $admin_url)],
-    ];
+    return array(
+      \Drupal::l(t('Install another module'), new Url('update.module_install')),
+      \Drupal::l(t('Enable newly added modules'), new Url('system.modules_list')),
+      \Drupal::l(t('Administration pages'), new Url('system.admin')),
+    );
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Updater/Theme.php b/core/lib/Drupal/Core/Updater/Theme.php
index b4bc210..ea853c8 100644
--- a/core/lib/Drupal/Core/Updater/Theme.php
+++ b/core/lib/Drupal/Core/Updater/Theme.php
@@ -83,13 +83,9 @@ public function postInstall() {
    * Overrides Drupal\Core\Updater\Updater::postInstallTasks().
    */
   public function postInstallTasks() {
-    $theme_page_url = Url::fromRoute('system.themes_page')
-                         ->setOption('base_url', $GLOBALS['base_url']);
-    $admin_url = Url::fromRoute('system.admin')
-                    ->setOption('base_url', $GLOBALS['base_url']);
-    return [
-      ['#markup' => \Drupal::l(t('Install newly added themes'), $theme_page_url)],
-      ['#markup' => \Drupal::l(t('Administration pages'), $admin_url)],
-    ];
+    return array(
+      \Drupal::l(t('Install newly added themes'), new Url('system.themes_page')),
+      \Drupal::l(t('Administration pages'), new Url('system.admin')),
+    );
   }
 }