diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 4a350a287..3f0d197f3 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -222,7 +222,7 @@ parameters:
 
 		-
 			message: "#^Cannot access offset 'expr' on mixed\\.$#"
-			count: 4
+			count: 2
 			path: src/Components/OptionsArray.php
 
 		-
@@ -237,12 +237,12 @@ parameters:
 
 		-
 			message: "#^Cannot access offset 1 on mixed\\.$#"
-			count: 6
+			count: 2
 			path: src/Components/OptionsArray.php
 
 		-
 			message: "#^Cannot access offset 2 on mixed\\.$#"
-			count: 2
+			count: 1
 			path: src/Components/OptionsArray.php
 
 		-
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 93e6d11b6..58c4093f3 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
+<files psalm-version="5.18.0@b113f3ed0259fd6e212d87c3df80eec95a6abf19">
   <file src="src/Components/AlterOperation.php">
     <PossiblyNullPropertyAssignmentValue>
       <code>$options</code>
@@ -93,9 +93,6 @@
     <DocblockTypeContradiction>
       <code>$prev[0] === null</code>
     </DocblockTypeContradiction>
-    <InvalidArgument>
-      <code><![CDATA[$options['breakOnParentheses']]]></code>
-    </InvalidArgument>
     <MixedArrayOffset>
       <code><![CDATA[Parser::STATEMENT_PARSERS[$token->keyword]]]></code>
       <code><![CDATA[self::ALLOWED_KEYWORDS[$token->keyword]]]></code>
@@ -120,9 +117,6 @@
       <code>$prev[1] !== null</code>
       <code><![CDATA[empty($ret->function) && ($prev[1] !== null)]]></code>
     </RedundantConditionGivenDocblockType>
-    <TypeDoesNotContainType>
-      <code><![CDATA[empty($options['field'])]]></code>
-    </TypeDoesNotContainType>
   </file>
   <file src="src/Components/ExpressionArray.php">
     <InvalidReturnStatement>
@@ -1013,9 +1007,9 @@
     </PossiblyNullArrayOffset>
   </file>
   <file src="src/Tools/ContextGenerator.php">
-    <PossiblyNullArgument>
+    <PossiblyInvalidArgument>
       <code><![CDATA[$options['keywords']]]></code>
-    </PossiblyNullArgument>
+    </PossiblyInvalidArgument>
     <RedundantCondition>
       <code>++$i !== $count</code>
       <code>++$i !== $count</code>
@@ -1220,9 +1214,6 @@
       <code>has</code>
       <code>has</code>
     </PossiblyNullReference>
-    <RedundantCondition>
-      <code><![CDATA[$ret['select_tables'] === []]]></code>
-    </RedundantCondition>
   </file>
   <file src="src/Utils/Routine.php">
     <MixedArgumentTypeCoercion>