diff --git a/core/lib/Drupal/Core/Url.php b/core/lib/Drupal/Core/Url.php
index 7525374..a34333d 100644
--- a/core/lib/Drupal/Core/Url.php
+++ b/core/lib/Drupal/Core/Url.php
@@ -72,7 +72,7 @@ class Url {
    *   Url::fromUri(Url::SCHEME_BASE . ':/index.html').
    *
    * Do not use this scheme for linking to pages generated by Drupal. With this
-   * scheme, mo path processors are applied (including language prefixes and
+   * scheme, no path processors are applied (including language prefixes and
    * aliases) and no access checking is performed. This means it is
    * incompatible with:
    * - Multilingual sites
@@ -266,7 +266,7 @@ public function __construct($route_name, $route_parameters = array(), $options =
    *     defined, the current scheme is used, so the user stays on HTTP or HTTPS
    *     respectively. TRUE enforces HTTPS and FALSE enforces HTTP.
    *
-   * @return \Drupal\Core\Url
+   * @return static
    *   A new Url object for a routed (internal to Drupal) URL.
    *
    * @see \Drupal\Core\Url::fromRouteMatch()
@@ -289,7 +289,7 @@ public static function fromRoute($route_name, $route_parameters = array(), $opti
    * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
    *   The route match.
    *
-   * @return $this
+   * @return static
    *
    * @see \Drupal\Core\Url::fromRoute()
    * @see \Drupal\Core\Routing\RouteMatchInterface
@@ -321,7 +321,7 @@ public static function fromRouteMatch(RouteMatchInterface $route_match) {
    * @param array $options
    *   (optional) An array of options. See Url::fromUri() for details.
    *
-   * @return \Drupal\Core\Url
+   * @return static
    *   A new Url object for an unrouted URL within the site installation
    *   directory.
    *
@@ -354,7 +354,7 @@ public static function fromBaseRelativePath($path, $options = array()) {
    * @param array $options
    *   (optional) An array of options. See Url::fromUri() for details.
    *
-   * @return \Drupal\Core\Url
+   * @return static
    *   A new Url object for an unrouted, host-relative URL not internal to
    *   Drupal, but relative to the site host.
    *
@@ -397,7 +397,7 @@ protected static function trimLeadingSlashes($path) {
    * @param array $options
    *   (optional) An array of options. See Url::fromUri() for details.
    *
-   * @return \Drupal\Core\Url
+   * @return static
    *   A new Url object based on user input.
    *
    * @todo The intent here is to support a user interaction pattern where
@@ -456,7 +456,7 @@ public static function fromUserInput($path, $options = []) {
    *     defined, the current scheme is used, so the user stays on HTTP or HTTPS
    *     respectively. TRUE enforces HTTPS and FALSE enforces HTTP.
    *
-   * @return \Drupal\Core\Url
+   * @return static
    *   A new Url object with properties depending on the URI scheme.
    *
    * @throws \InvalidArgumentException
@@ -528,7 +528,7 @@ public static function fromUri($uri, $options = []) {
    * @param string $uri
    *   The original entered URI.
    *
-   * @return \Drupal\Core\Url
+   * @return static
    *   A new Url object for an entity's canonical route.
    *
    * @throws \InvalidArgumentException
@@ -579,7 +579,7 @@ protected static function fromEntityUri(array $uri_parts, array $options, $uri)
    * @param array $options
    *   An array of options. See Url::fromUri() for details.
    *
-   * @return \Drupal\Core\Url
+   * @return static
    *   A new Url object for a 'user-path:' URI.
    *
    * @todo Rename this method depending on the outcome of:
@@ -621,7 +621,7 @@ protected static function fromUserPathUri(array $uri_parts, array $options) {
    * @param string $uri
    *   The original passed in URI.
    *
-   * @return \Drupal\Core\Url
+   * @return static
    *   A new Url object for a 'route:' URI.
    *
    * @throws \InvalidArgumentException