diff --git a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
index dc14d07..8556f9b 100644
--- a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
@@ -95,6 +95,8 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) {
         $content = Xss::filterAdmin(String::format($this->config->get('system.maintenance')->get('message'), array(
           '@site' => $this->config->get('system.site')->get('name'),
         )));
+        // @todo Break the dependency on DefaultHtmlPageRenderer, see:
+        //   https://www.drupal.org/node/2295609
         $content = DefaultHtmlPageRenderer::renderPage($content, $this->t('Site under maintenance'));
         $response = new Response('Service unavailable', 503);
         $response->setContent($content);
@@ -103,7 +105,7 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) {
       else {
         // Display a message if the logged in user has access to the site in
         // maintenance mode. However, suppress it on the maintenance mode
-        // setting spage.
+        // settings page.
         if ($route_match->getRouteName() != 'system.site_maintenance_mode') {
           if ($this->account->hasPermission('administer site configuration')) {
             $this->drupalSetMessage($this->t('Operating in maintenance mode. <a href="@url">Go online.</a>', array('@url' => $this->urlGenerator->generate('system.site_maintenance_mode'))), 'status', FALSE);