diff --git a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
index 463ba34..9e0ec13 100644
--- a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
+++ b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
@@ -19,6 +19,9 @@
  */
 class ContainerBuilder extends SymfonyContainerBuilder {
 
+  /**
+   * {@inheritdoc}
+   */
   public function __construct(ParameterBagInterface $parameterBag = null) {
     $this->setResourceTracking(false);
     parent::__construct($parameterBag);
diff --git a/core/modules/book/src/Plugin/Block/BookNavigationBlock.php b/core/modules/book/src/Plugin/Block/BookNavigationBlock.php
index 7a7448f..5e85d99 100644
--- a/core/modules/book/src/Plugin/Block/BookNavigationBlock.php
+++ b/core/modules/book/src/Plugin/Block/BookNavigationBlock.php
@@ -11,6 +11,7 @@
 use Drupal\book\BookManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Provides a 'Book navigation' block.
diff --git a/core/modules/user/src/Form/UserLoginForm.php b/core/modules/user/src/Form/UserLoginForm.php
index 58e0ba2..6300bfc 100644
--- a/core/modules/user/src/Form/UserLoginForm.php
+++ b/core/modules/user/src/Form/UserLoginForm.php
@@ -118,14 +118,14 @@ public function submitForm(array &$form, array &$form_state) {
     $account = $this->userStorage->load($form_state['uid']);
 
     // A destination was set, probably on an exception controller,
-    if (!$this->request->request->has('destination')) {
+    if (!$this->getRequest()->request->has('destination')) {
       $form_state['redirect_route'] = array(
         'route_name' => 'user.view',
         'route_parameters' => array('user' => $account->id()),
       );
     }
     else {
-      $this->request->query->set('destination', $this->request->request->get('destination'));
+      $this->getRequest()->query->set('destination', $this->getRequest()->request->get('destination'));
     }
 
     user_login_finalize($account);
diff --git a/core/modules/user/src/Form/UserMultipleCancelConfirm.php b/core/modules/user/src/Form/UserMultipleCancelConfirm.php
index 4ad6e2b..7ed11bc 100644
--- a/core/modules/user/src/Form/UserMultipleCancelConfirm.php
+++ b/core/modules/user/src/Form/UserMultipleCancelConfirm.php
@@ -190,7 +190,7 @@ public function submitForm(array &$form, array &$form_state) {
           $admin_form = $this->entityManager->getFormObject('user', 'cancel');
           $admin_form->setEntity($account);
           // Calling this directly required to init form object with $account.
-          $admin_form->buildForm($admin_form_mock, $admin_form_state, $this->request);
+          $admin_form->buildForm($admin_form_mock, $admin_form_state);
           $admin_form->submit($admin_form_mock, $admin_form_state);
         }
         else {