diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index 004b359..3d8cd31 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -35,8 +35,7 @@ class DrupalKernel extends Kernel {
   protected $systemList;
 
   /**
-   * Whether to use a compiled Container as opposed to a ContainerBuilder for
-   * the DI container.
+   * Whether to use a compiled Container as opposed to a ContainerBuilder.
    *
    * @var boolean
    */
@@ -96,6 +95,11 @@ public function registerBundles() {
 
   /**
    * Initializes the service container.
+   *
+   * @todo We are compiling the container and dumping to a PHP file whose name
+   *   is based on the list of enabled modules. A new file is created when this
+   *   list changes but there is currently no garbage collection in place for
+   *   the old files. See http://drupal.org/node/1759582.
    */
   protected function initializeContainer() {
     if (!$this->useCompiledContainer) {
@@ -114,7 +118,7 @@ protected function initializeContainer() {
       // needing to rebuild the DIC at the right time on module enable: simply on
       // the next request the hash will change and so the container will be
       // rebuilt.
-      $class = 'c' . $this->systemList['module_enabled_hash'] . ($this->debug ? 'Debug' : '');
+      $class = 'c' . $this->systemList['module_enabled_hash'] . ucfirst($this->environment) . ($this->debug ? 'Debug' : '');
       $cache_file = $class . '.php';
 
       // First, try to load.
diff --git a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
index d96719a..041c0f1 100644
--- a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
@@ -17,8 +17,17 @@
  */
 class FinishResponseSubscriber implements EventSubscriberInterface {
 
+  /**
+   * @var LanguageManager
+   *   The LanguageManager object for retrieving the correct language code.
+   */
   protected $languageManager;
 
+  /**
+   * Constructs a FinishResponseSubscriber object.
+   *
+   * @param LanguageManager $language_manager
+   */
   public function __construct(LanguageManager $language_manager) {
     $this->languageManager = $language_manager;
   }