diff --git a/core/lib/Drupal/Core/Config/Context/ConfigContext.php b/core/lib/Drupal/Core/Config/Context/ConfigContext.php
index f164d95..f025313 100644
--- a/core/lib/Drupal/Core/Config/Context/ConfigContext.php
+++ b/core/lib/Drupal/Core/Config/Context/ConfigContext.php
@@ -64,7 +64,7 @@ class ConfigContext extends MemoryStorage implements ContextInterface {
    * @param Drupal\Core\Config\StorageInterface $storage
    *   The storage controller object to use for reading and writing
    *   configuration data.
-   * @param Symfony\Component\EventDispatcher\EventDispatcher
+   * @param Symfony\Component\EventDispatcher\EventDispatcher $event_dispatcher
    *   An event dispatcher instance to use for configuration events.
    */
   public function __construct(StorageInterface $storage, EventDispatcher $event_dispatcher) {
diff --git a/core/lib/Drupal/Core/Config/ContextInterface.php b/core/lib/Drupal/Core/Config/ContextInterface.php
index e4ce751..44b725b 100644
--- a/core/lib/Drupal/Core/Config/ContextInterface.php
+++ b/core/lib/Drupal/Core/Config/ContextInterface.php
@@ -35,7 +35,7 @@ public function getStorage();
    *
    * @param string $config_event_name
    *   Event name.
-   * @param Drupal\Core\Config\Config
+   * @param Drupal\Core\Config\Config $config
    *   (optional) Configuration object.
    */
   public function notify($config_event_name, Config $config = NULL);
diff --git a/core/lib/Drupal/Core/EventSubscriber/ConfigOverrideSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ConfigOverrideSubscriber.php
index a021638..41ca797 100644
--- a/core/lib/Drupal/Core/EventSubscriber/ConfigOverrideSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/ConfigOverrideSubscriber.php
@@ -35,7 +35,7 @@ public function configInit(ConfigEvent $event) {
   /**
    * Implements EventSubscriberInterface::getSubscribedEvents().
    */
-  static function getSubscribedEvents() {
+  public static function getSubscribedEvents() {
     $events['config.init'][] = array('configInit', 30);
     return $events;
   }
diff --git a/core/modules/user/lib/Drupal/user/UserConfigContext.php b/core/modules/user/lib/Drupal/user/UserConfigContext.php
index 0c484ce..8b3689d 100644
--- a/core/modules/user/lib/Drupal/user/UserConfigContext.php
+++ b/core/modules/user/lib/Drupal/user/UserConfigContext.php
@@ -18,7 +18,8 @@ class UserConfigContext extends ObjectContext {
   /**
    * Overrides Drupal\Core\Config\ConfigContext::__construct().
    *
-   * @param Drupal\user\Plugin\Core\Entity\User $user;
+   * @param Drupal\user\Plugin\Core\Entity\User $user
+   *   The user object to use in this context.
    */
   public function __construct($user) {
     parent::__construct('user.account', $user);