diff --git a/docs/book/v2/migration.md b/docs/book/v2/migration.md
index 035b87e8..7cf5701b 100644
--- a/docs/book/v2/migration.md
+++ b/docs/book/v2/migration.md
@@ -29,10 +29,6 @@ The first approach may fail if libraries you depend on specifically require a
 version 1 release. The second approach may leave you on a version 1 release in
 situations where other libraries you depend on require version 1.
 
-In all cases, if you are only using the PSR-7 implementations and/or the
-`ServerRequestFactory::fromGlobals()` functionality, upgrading to version 2 will
-pose no backwards compatibility issues.
-
 ## Changed
 
 - `Laminas\Diactoros\RequestTrait` now raises an `InvalidArgumentException` in
@@ -42,6 +38,12 @@ pose no backwards compatibility issues.
   `UnexpectedValueException` due to an unexpected HTTP method; this is due to the
   fact that the HTTP method value can no longer be set to an invalid value.
 
+- `Laminas\Diactoros\marshalHeadersFromSapi()` is parsing headers differently compared to the legacy implementation.
+   As a consequence Headers with `'0'` as values will be part of the parsed Headers.
+   In former versions those headers were ignored.
+   Usages of `\Laminas\Diactoros\MessageTrait::hasHeader()` and `\Laminas\Diactoros\MessageTrait::getHeader()`
+   might be affected if you are using `ServerRequestFactory::fromGlobals()` functionality.
+
 ## Removed
 
 Several features were removed for version 2. These include removal of the
diff --git a/src/Exception/UploadedFileErrorException.php b/src/Exception/UploadedFileErrorException.php
index b3a3e68e..a12e95ab 100644
--- a/src/Exception/UploadedFileErrorException.php
+++ b/src/Exception/UploadedFileErrorException.php
@@ -31,7 +31,7 @@ public static function dueToUnwritablePath() : self
     public static function dueToUnwritableTarget(string $targetDirectory) : self
     {
         return new self(sprintf(
-            'The target directory `%s` does not exists or is not writable',
+            'The target directory `%s` does not exist or is not writable',
             $targetDirectory
         ));
     }