diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 5757993a..f94fc42a 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -465,11 +465,6 @@ parameters:
 			count: 1
 			path: src/lib/Output/FieldTypeSerializer.php
 
-		-
-			message: "#^Access to an undefined property Ibexa\\\\Rest\\\\Output\\\\Generator\\\\Json\\\\JsonObject\\:\\:\\$\\#\\.$#"
-			count: 1
-			path: src/lib/Output/Generator/InMemory/Xml.php
-
 		-
 			message: "#^Access to an undefined property Ibexa\\\\Rest\\\\Output\\\\Generator\\\\Json\\\\JsonObject\\:\\:\\$\\#text\\.$#"
 			count: 1
@@ -500,6 +495,16 @@ parameters:
 			count: 1
 			path: src/lib/Output/Generator/Json/FieldTypeHashGenerator.php
 
+		-
+			message: "#^Access to an undefined property Ibexa\\\\Rest\\\\Output\\\\Generator\\\\Json\\\\JsonObject\\:\\:\\$\\#\\.$#"
+			count: 1
+			path: src/lib/Output/Generator/Xml.php
+
+		-
+			message: "#^Access to an undefined property Ibexa\\\\Rest\\\\Output\\\\Generator\\\\Json\\\\JsonObject\\:\\:\\$value\\.$#"
+			count: 2
+			path: src/lib/Output/Generator/Xml/FieldTypeHashGenerator.php
+
 		-
 			message: "#^Method Ibexa\\\\Rest\\\\Output\\\\ValueObjectVisitor\\\\ContentObjectStates\\:\\:visit\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -5910,11 +5915,6 @@ parameters:
 			count: 1
 			path: tests/lib/Output/ValueObjectVisitorBaseTest.php
 
-		-
-			message: "#^Property Ibexa\\\\Tests\\\\Rest\\\\Output\\\\ValueObjectVisitorBaseTest\\:\\:\\$generator \\(Ibexa\\\\Rest\\\\Output\\\\Generator\\\\InMemory\\\\Xml\\) in isset\\(\\) is not nullable\\.$#"
-			count: 1
-			path: tests/lib/Output/ValueObjectVisitorBaseTest.php
-
 		-
 			message: "#^Property Ibexa\\\\Tests\\\\Rest\\\\Output\\\\ValueObjectVisitorBaseTest\\:\\:\\$routerMock \\(PHPUnit\\\\Framework\\\\MockObject\\\\MockObject&Symfony\\\\Component\\\\Routing\\\\RouterInterface\\) does not accept null\\.$#"
 			count: 1