diff --git a/autoload.php b/autoload.php
index 1e5ad34e3b..7d2408d637 100644
--- a/autoload.php
+++ b/autoload.php
@@ -11,4 +11,4 @@
  * @see core/modules/statistics/statistics.php
  */
 
-return require __DIR__ . '/vendor/autoload.php';
+return require __DIR__ . '/../vendor/autoload.php';
diff --git a/core/modules/media_library/src/MediaLibraryState.php b/core/modules/media_library/src/MediaLibraryState.php
index 7a0a4f6363..afb3a3e64b 100644
--- a/core/modules/media_library/src/MediaLibraryState.php
+++ b/core/modules/media_library/src/MediaLibraryState.php
@@ -80,7 +80,7 @@ public function __construct(array $parameters = []) {
    *   library.
    * @param array $opener_parameters
    *   (optional) Any additional opener-specific parameter values.
-   * @param string $form_mode
+   * @param string|null $form_mode
    *   (optional) The form_mode machine name for the add media form.
    *
    * @return static
@@ -153,7 +153,7 @@ public static function fromRequest(Request $request) {
    * @param int $remaining_slots
    *   The number of remaining items the user is allowed to select or add in the
    *   library.
-   * @param string $form_mode
+   * @param string|null $form_mode
    *   The form_mode machine name for the add media form.
    *
    * @throws \InvalidArgumentException