diff --git a/core/lib/Drupal/Core/Session/MetadataBag.php b/core/lib/Drupal/Core/Session/MetadataBag.php
index 775d9c5..a45f014 100644
--- a/core/lib/Drupal/Core/Session/MetadataBag.php
+++ b/core/lib/Drupal/Core/Session/MetadataBag.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Session\MetadataBag
+ * Contains \Drupal\Core\Session\MetadataBag.
  */
 
 namespace Drupal\Core\Session;
@@ -11,14 +11,14 @@
 use Symfony\Component\HttpFoundation\Session\Storage\MetadataBag as SymfonyMetadataBag;
 
 /**
- * Metadata container for application specific session metadata.
+ * Provides a container for application specific session metadata.
  */
 class MetadataBag extends SymfonyMetadataBag {
 
   /**
-   * Construct a new metadata bag instance.
+   * Constructs a new metadata bag instance.
    *
-   * @param \Drupal\Core\Utility\Settings $settings
+   * @param \Drupal\Component\Utility\Settings $settings
    *   The settings instance.
    */
   public function __construct(Settings $settings) {
diff --git a/core/lib/Drupal/Core/Session/SessionManager.php b/core/lib/Drupal/Core/Session/SessionManager.php
index 63e55c5..3798c63 100644
--- a/core/lib/Drupal/Core/Session/SessionManager.php
+++ b/core/lib/Drupal/Core/Session/SessionManager.php
@@ -81,11 +81,12 @@ public function __construct(RequestStack $request_stack, Connection $connection,
 
     $this->setMixedMode($settings->get('mixed_mode_sessions', FALSE));
 
-    // @todo: When not using the Symfony Session object, the list of bags in the
-    // NativeSessionStorage will remain uninitialized. This will lead to errors
-    // in NativeSessionHandler::loadSession. Remove this as soon as we are using
-    // the Symfony session object (which registers an attribute bag with the
-    // manager upon instantiation).
+    // @todo When not using the Symfony Session object, the list of bags in the
+    //   NativeSessionStorage will remain uninitialized. This will lead to
+    //   errors in NativeSessionHandler::loadSession. Remove this after
+    //   https://drupal.org/node/2229145, when we will be using the Symfony
+    //   session object (which registers an attribute bag with the
+    //   manager upon instantiation).
     $this->bags = array();
   }
 
@@ -335,7 +336,10 @@ protected function isCli() {
   }
 
   /**
-   * Test whether the session is empty.
+   * Tests whether the session is empty.
+   *
+   * @param array $session
+   *   (optional) Information about the session.
    *
    * @return bool
    *   TRUE when the session does not contain any values.
diff --git a/core/lib/Drupal/Core/Session/SessionManagerInterface.php b/core/lib/Drupal/Core/Session/SessionManagerInterface.php
index 0d06b05..dc9aa40 100644
--- a/core/lib/Drupal/Core/Session/SessionManagerInterface.php
+++ b/core/lib/Drupal/Core/Session/SessionManagerInterface.php
@@ -58,7 +58,7 @@ public function disable();
   public function enable();
 
   /**
-   * Return whether mixed mode SSL sessions are enabled in the session manager.
+   * Returns whether mixed mode SSL sessions are enabled in the session manager.
    *
    * @return bool
    *   Value of the mixed mode SSL sessions flag.
@@ -66,7 +66,7 @@ public function enable();
   public function isMixedMode();
 
   /**
-   * Whether or not to enable mixed mode SSL sessions in the session manager.
+   * Enables or disables mixed mode SSL sessions in the session manager.
    *
    * @param bool $mixed_mode
    *   New value for the mixed mode SSL sessions flag.
@@ -74,7 +74,11 @@ public function isMixedMode();
   public function setMixedMode($mixed_mode);
 
   /**
-   * The name of the insecure session when operating in mixed mode SSL.
+   * Returns the name of the insecure session when operating in mixed mode SSL.
+   *
+   * @return string
+   *   The name of the insecure session.
    */
   public function getInsecureName();
+
 }