diff --git a/baseline.xml b/baseline.xml
index d629609f8..5064237b4 100644
--- a/baseline.xml
+++ b/baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.19.0@a2ad69ae4f5ab1f7d225a8dc4e2ec2d9415ed599">
+<files psalm-version="4.22.0@fc2c6ab4d5fa5d644d8617089f012f3bb84b8703">
   <file src="src/Serializer/DefaultHydrator.php">
     <MixedAssignment occurrences="5">
       <code>$data[$propertyMetadata['fieldName']]</code>
@@ -9,6 +9,11 @@
       <code>$value</code>
     </MixedAssignment>
   </file>
+  <file src="src/Store/MultiTableStore.php">
+    <UnnecessaryVarAnnotation occurrences="1">
+      <code>array{id: string, aggregate_id: string, playhead: string, event: class-string, payload: string, recorded_on: string}|null</code>
+    </UnnecessaryVarAnnotation>
+  </file>
   <file src="tests/Benchmark/BasicImplementation/Aggregate/Profile.php">
     <MoreSpecificImplementedParamType occurrences="1">
       <code>$payload</code>
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index b181454e3..a01a379c6 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1,14 +1,9 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Method Patchlevel\\\\EventSourcing\\\\Console\\\\DoctrineHelper\\:\\:databaseName\\(\\) should return string but returns mixed\\.$#"
-			count: 2
-			path: src/Console/DoctrineHelper.php
-
-		-
-			message: "#^Unable to resolve the template type T in call to method Patchlevel\\\\EventSourcing\\\\Serializer\\\\Serializer\\:\\:deserialize\\(\\)$#"
+			message: "#^Cannot unset offset 'url' on array\\{charset\\?\\: string, dbname\\?\\: string, defaultTableOptions\\?\\: array\\<string, mixed\\>, default_dbname\\?\\: string, driver\\?\\: 'ibm_db2'\\|'mysqli'\\|'oci8'\\|'pdo_mysql'\\|'pdo_oci'\\|'pdo_pgsql'\\|'pdo_sqlite'\\|'pdo_sqlsrv'\\|'sqlsrv', driverClass\\?\\: class\\-string\\<Doctrine\\\\DBAL\\\\Driver\\>, driverOptions\\?\\: array, host\\?\\: string, \\.\\.\\.\\}\\.$#"
 			count: 1
-			path: src/Store/MultiTableStore.php
+			path: src/Console/DoctrineHelper.php
 
 		-
 			message: "#^While loop condition is always true\\.$#"
diff --git a/src/Console/DoctrineHelper.php b/src/Console/DoctrineHelper.php
index d21ebc914..7774966ae 100644
--- a/src/Console/DoctrineHelper.php
+++ b/src/Console/DoctrineHelper.php
@@ -50,10 +50,7 @@ public function copyConnectionWithoutDatabase(Connection $connection): Connectio
          */
         unset($params['dbname'], $params['path'], $params['url']);
 
-        $tmpConnection = DriverManager::getConnection($params);
-        $tmpConnection->connect();
-
-        return $tmpConnection;
+        return DriverManager::getConnection($params);
     }
 
     public function hasDatabase(Connection $connection, string $databaseName): bool
diff --git a/src/Store/MultiTableStore.php b/src/Store/MultiTableStore.php
index 6040b5f29..d08b9cd62 100644
--- a/src/Store/MultiTableStore.php
+++ b/src/Store/MultiTableStore.php
@@ -173,6 +173,7 @@ public function stream(int $fromIndex = 0): Generator
                 throw new AggregateNotDefined($name);
             }
 
+            /** @var array{id: string, aggregate_id: string, playhead: string, event: class-string, payload: string, recorded_on: string}|null $eventData */
             $eventData = $queries[$name]->current();
 
             if ($eventData === null) {