diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index f48e548..a2a610b 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -241,8 +241,8 @@ function aggregator_menu() {
 /**
  * Title callback: Returns a title for Aggregator feed view pages.
  *
- * @param int $fid
- *   Aggregator Feed Id for which to generate a label.
+ * @param \Drupal\aggregator\FeedInterface $feed
+ *   Aggregator Feed to get a label.
  * @param string $langcode
  *   (optional) The language code of the language that should be used for
  *   getting the label. If set to NULL, the entity's default language is
@@ -254,9 +254,8 @@ function aggregator_menu() {
  *
  * @see aggregator_menu()
  */
-function _aggregator_page_label($fid, $langcode = NULL) {
-  $feed = aggregator_feed_load($fid);
-  return ($feed) ? entity_page_label($feed, $langcode) : '';
+function _aggregator_page_label($feed, $langcode = NULL) {
+  return $feed->label($langcode);
 }
 
 /**
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php b/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php
index fe15f78..e72bd2d 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php
@@ -145,7 +145,7 @@ protected function buildPageList(array $items, $feed_source = '') {
         ->viewMultiple($items, 'default');
       $build['pager']['#theme'] = 'pager';
     }
-    return $build;
+    return drupal_render($build);
   }