diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 2993acd..0fc44f7 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -255,11 +255,6 @@ parameters:
 			count: 1
 			path: src/lib/CoreFilter/NativeCoreFilter.php
 
-		-
-			message: "#^Method Ibexa\\\\Solr\\\\CoreFilter\\\\NativeCoreFilter\\:\\:getLanguageFilter\\(\\) should return Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\Criterion but returns Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\Criterion\\\\CustomField\\|Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\Criterion\\\\LogicalAnd\\|Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\Criterion\\\\LogicalNot\\|Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\Criterion\\\\LogicalOr\\|false\\.$#"
-			count: 1
-			path: src/lib/CoreFilter/NativeCoreFilter.php
-
 		-
 			message: "#^Parameter \\#2 \\$languageCode of method Ibexa\\\\Solr\\\\DocumentMapper\\\\NativeDocumentMapper\\:\\:generateContentDocumentId\\(\\) expects string\\|null, int\\|string given\\.$#"
 			count: 1
@@ -785,16 +780,6 @@ parameters:
 			count: 1
 			path: src/lib/Query/Common/CriterionVisitor/Aggregate.php
 
-		-
-			message: "#^Access to an undefined property Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\Criterion\\:\\:\\$criteria\\.$#"
-			count: 1
-			path: src/lib/Query/Common/CriterionVisitor/CompositeCriterion.php
-
-		-
-			message: "#^Cannot call method visit\\(\\) on Ibexa\\\\Contracts\\\\Solr\\\\Query\\\\CriterionVisitor\\|null\\.$#"
-			count: 1
-			path: src/lib/Query/Common/CriterionVisitor/CompositeCriterion.php
-
 		-
 			message: "#^Parameter \\#2 \\$array of function array_map expects array, array\\<bool\\|float\\|int\\|string\\>\\|bool\\|float\\|int\\|string given\\.$#"
 			count: 1
@@ -1080,11 +1065,6 @@ parameters:
 			count: 1
 			path: src/lib/Query/Content/CriterionVisitor/ParentLocationIdIn.php
 
-		-
-			message: "#^Instanceof between Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\Criterion and Ibexa\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\Criterion\\\\PermissionSubtree will always evaluate to false\\.$#"
-			count: 1
-			path: src/lib/Query/Content/CriterionVisitor/SubtreeIn.php
-
 		-
 			message: "#^Parameter \\#2 \\$array of function array_map expects array, array\\<bool\\|float\\|int\\|string\\>\\|bool\\|float\\|int\\|string given\\.$#"
 			count: 1