diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index c093a8792de07..5bd84ba170b8d 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -2066,11 +2066,6 @@
       <code><![CDATA[remove]]></code>
     </UndefinedMethod>
   </file>
-  <file src="lib/private/Files/ObjectStore/ObjectStoreStorage.php">
-    <InvalidScalarArgument>
-      <code><![CDATA[$source]]></code>
-    </InvalidScalarArgument>
-  </file>
   <file src="lib/private/Files/ObjectStore/S3ConnectionTrait.php">
     <InternalClass>
       <code><![CDATA[ClientResolver::_default_signature_provider()]]></code>
@@ -2165,16 +2160,6 @@
       <code><![CDATA[$size]]></code>
     </InvalidScalarArgument>
   </file>
-  <file src="lib/private/Files/Storage/Wrapper/Jail.php">
-    <InvalidReturnStatement>
-      <code><![CDATA[$this->getWrapperStorage()->filetype($this->getUnjailedPath($path))]]></code>
-    </InvalidReturnStatement>
-    <InvalidReturnType/>
-  </file>
-  <file src="lib/private/Files/Storage/Wrapper/Wrapper.php">
-    <InvalidReturnStatement/>
-    <InvalidReturnType/>
-  </file>
   <file src="lib/private/Files/Stream/SeekableHttpStream.php">
     <InvalidReturnType>
       <code><![CDATA[stream_close]]></code>
diff --git a/lib/public/Files/Storage/IStorage.php b/lib/public/Files/Storage/IStorage.php
index 2368e126bb7c8..924e91e8164a4 100644
--- a/lib/public/Files/Storage/IStorage.php
+++ b/lib/public/Files/Storage/IStorage.php
@@ -87,7 +87,7 @@ public function is_file($path);
 	 * only the following keys are required in the result: size and mtime
 	 *
 	 * @param string $path
-	 * @return array|bool
+	 * @return array|false
 	 * @since 9.0.0
 	 */
 	public function stat($path);
@@ -96,7 +96,7 @@ public function stat($path);
 	 * see https://www.php.net/manual/en/function.filetype.php
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string|false
 	 * @since 9.0.0
 	 */
 	public function filetype($path);
@@ -106,7 +106,7 @@ public function filetype($path);
 	 * The result for filesize when called on a folder is required to be 0
 	 *
 	 * @param string $path
-	 * @return false|int|float
+	 * @return int|float|false
 	 * @since 9.0.0
 	 */
 	public function filesize($path);
@@ -179,7 +179,7 @@ public function file_exists($path);
 	 * see https://www.php.net/manual/en/function.filemtime.php
 	 *
 	 * @param string $path
-	 * @return int|bool
+	 * @return int|false
 	 * @since 9.0.0
 	 */
 	public function filemtime($path);
@@ -237,7 +237,7 @@ public function copy($source, $target);
 	 *
 	 * @param string $path
 	 * @param string $mode
-	 * @return resource|bool
+	 * @return resource|false
 	 * @since 9.0.0
 	 */
 	public function fopen($path, $mode);
@@ -247,7 +247,7 @@ public function fopen($path, $mode);
 	 * The mimetype for a folder is required to be "httpd/unix-directory"
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string|false
 	 * @since 9.0.0
 	 */
 	public function getMimeType($path);
@@ -258,16 +258,16 @@ public function getMimeType($path);
 	 * @param string $type
 	 * @param string $path
 	 * @param bool $raw
-	 * @return string|bool
+	 * @return string|false
 	 * @since 9.0.0
 	 */
 	public function hash($type, $path, $raw = false);
 
 	/**
-	 * see https://www.php.net/manual/en/function.free_space.php
+	 * see https://www.php.net/manual/en/function.disk-free-space.php
 	 *
 	 * @param string $path
-	 * @return int|float|bool
+	 * @return int|float|false
 	 * @since 9.0.0
 	 */
 	public function free_space($path);
@@ -345,7 +345,7 @@ public function instanceOfStorage($class);
 	 * For now the returned array can hold the parameter url - in future more attributes might follow.
 	 *
 	 * @param string $path
-	 * @return array|bool
+	 * @return array|false
 	 * @since 9.0.0
 	 */
 	public function getDirectDownload($path);