diff --git a/.github/workflows/update-psalm-baseline.yml b/.github/workflows/update-psalm-baseline.yml
index f2b761aa60246..181148a6c8b31 100644
--- a/.github/workflows/update-psalm-baseline.yml
+++ b/.github/workflows/update-psalm-baseline.yml
@@ -42,6 +42,8 @@ jobs:
           author: nextcloud-command <nextcloud-command@users.noreply.github.com>
           signoff: true
           branch: automated/noid/psalm-baseline-update
+          # Make sure we can open multiple PRs
+          branch-suffix: timestamp
           title: '[Automated] Update psalm-baseline.xml'
           body: |
             Auto-generated update psalm-baseline.xml with fixed psalm warnings
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 156599e8b4179..bdcdeb5796a47 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -4261,11 +4261,6 @@
       <code>[]</code>
     </InvalidReturnStatement>
   </file>
-  <file src="lib/private/Preview/Bitmap.php">
-    <ImplicitToStringCast occurrences="1">
-      <code>$bp</code>
-    </ImplicitToStringCast>
-  </file>
   <file src="lib/private/Preview/Generator.php">
     <InvalidArgument occurrences="2">
       <code>$maxPreviewImage</code>
@@ -4305,11 +4300,6 @@
       <code>$provider-&gt;getThumbnail($file, $maxWidth, $maxHeight)</code>
     </NullableReturnStatement>
   </file>
-  <file src="lib/private/Preview/HEIC.php">
-    <ImplicitToStringCast occurrences="1">
-      <code>$bp</code>
-    </ImplicitToStringCast>
-  </file>
   <file src="lib/private/Preview/Movie.php">
     <InvalidScalarArgument occurrences="2">
       <code>$second</code>
@@ -4332,11 +4322,6 @@
       <code>string</code>
     </InvalidReturnType>
   </file>
-  <file src="lib/private/Preview/SVG.php">
-    <ImplicitToStringCast occurrences="1">
-      <code>$svg</code>
-    </ImplicitToStringCast>
-  </file>
   <file src="lib/private/RedisFactory.php">
     <InvalidScalarArgument occurrences="1">
       <code>\RedisCluster::OPT_SLAVE_FAILOVER</code>
@@ -4982,10 +4967,6 @@
     <RedundantCondition occurrences="1">
       <code>$isWritable</code>
     </RedundantCondition>
-    <TypeDoesNotContainType occurrences="2">
-      <code>get_class($resource) === 'GdImage'</code>
-      <code>get_class($this-&gt;resource) === 'GdImage'</code>
-    </TypeDoesNotContainType>
   </file>
   <file src="lib/private/legacy/OC_JSON.php">
     <InvalidScalarArgument occurrences="1">
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index 113290e2686fb..f2d91065b9abc 100644
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -1082,7 +1082,7 @@ public function getMimeType($path) {
 	 * @param string $type
 	 * @param string $path
 	 * @param bool $raw
-	 * @return bool|null|string
+	 * @return bool|string
 	 */
 	public function hash($type, $path, $raw = false) {
 		$postFix = (substr($path, -1) === '/') ? '/' : '';
@@ -1104,7 +1104,7 @@ public function hash($type, $path, $raw = false) {
 				return $storage->hash($type, $internalPath, $raw);
 			}
 		}
-		return null;
+		return false;
 	}
 
 	/**