diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index a5be1e58f2f..27efd324477 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -410,11 +410,6 @@ parameters:
 			count: 1
 			path: app/Functions/FunctionsPrintFacts.php
 
-		-
-			message: "#^Array \\(array\\<array\\<string\\>\\>\\) does not accept array\\<string, string\\|null\\>\\.$#"
-			count: 1
-			path: app/GedcomRecord.php
-
 		-
 			message: "#^Cannot call method acceptRecord\\(\\) on mixed\\.$#"
 			count: 3
@@ -455,6 +450,11 @@ parameters:
 			count: 1
 			path: app/GedcomRecord.php
 
+		-
+			message: "#^Property Fisharebest\\\\Webtrees\\\\GedcomRecord\\:\\:\\$getAllNames \\(array\\<array\\<string\\>\\>\\) does not accept array\\<array\\<string\\|null\\>\\>\\.$#"
+			count: 1
+			path: app/GedcomRecord.php
+
 		-
 			message: "#^Cannot call method getAttribute\\(\\) on mixed\\.$#"
 			count: 3
@@ -1500,11 +1500,6 @@ parameters:
 			count: 1
 			path: app/I18N.php
 
-		-
-			message: "#^Array \\(array\\<array\\<string\\>\\>\\) does not accept array\\<string, mixed\\>\\.$#"
-			count: 1
-			path: app/Individual.php
-
 		-
 			message: "#^Binary operation \"\\*\" between string and 365 results in an error\\.$#"
 			count: 1
@@ -1845,11 +1840,6 @@ parameters:
 			count: 2
 			path: app/Module/FamilyTreeFavoritesModule.php
 
-		-
-			message: "#^Call to function is_string\\(\\) with object\\|null will always evaluate to false\\.$#"
-			count: 1
-			path: app/Module/FamilyTreeNewsModule.php
-
 		-
 			message: "#^Cannot call method findByComponent\\(\\) on mixed\\.$#"
 			count: 1
@@ -2795,11 +2785,6 @@ parameters:
 			count: 1
 			path: app/Module/UserFavoritesModule.php
 
-		-
-			message: "#^Call to function is_string\\(\\) with object\\|null will always evaluate to false\\.$#"
-			count: 1
-			path: app/Module/UserJournalModule.php
-
 		-
 			message: "#^Argument of an invalid type array\\<int, string\\>\\|false supplied for foreach, only iterables are supported\\.$#"
 			count: 2
@@ -2975,11 +2960,6 @@ parameters:
 			count: 1
 			path: app/PlaceLocation.php
 
-		-
-			message: "#^Array \\(array\\<array\\<string, string\\>\\>\\) does not accept string\\.$#"
-			count: 1
-			path: app/Report/PdfRenderer.php
-
 		-
 			message: "#^Method Fisharebest\\\\Webtrees\\\\Report\\\\PdfRenderer\\:\\:getStyle\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -3010,6 +2990,11 @@ parameters:
 			count: 1
 			path: app/Report/PdfRenderer.php
 
+		-
+			message: "#^Property Fisharebest\\\\Webtrees\\\\Report\\\\AbstractRenderer\\:\\:\\$styles \\(array\\<array\\<string, string\\>\\>\\) does not accept array\\<array\\<string, string\\>\\|string\\>\\.$#"
+			count: 1
+			path: app/Report/PdfRenderer.php
+
 		-
 			message: "#^Parameter \\#1 \\$x of method Fisharebest\\\\Webtrees\\\\Report\\\\HtmlRenderer\\:\\:setX\\(\\) expects float, mixed given\\.$#"
 			count: 1
@@ -3045,6 +3030,21 @@ parameters:
 			count: 1
 			path: app/Report/ReportHtmlTextbox.php
 
+		-
+			message: "#^Parameter \\#1 \\$fp of function fclose expects resource, resource\\|false given\\.$#"
+			count: 1
+			path: app/Report/ReportParserBase.php
+
+		-
+			message: "#^Parameter \\#1 \\$fp of function feof expects resource, resource\\|false given\\.$#"
+			count: 1
+			path: app/Report/ReportParserBase.php
+
+		-
+			message: "#^Parameter \\#1 \\$fp of function fread expects resource, resource\\|false given\\.$#"
+			count: 1
+			path: app/Report/ReportParserBase.php
+
 		-
 			message: "#^Parameter \\#1 \\$function of function call_user_func expects callable\\(\\)\\: mixed, array\\{\\$this\\(Fisharebest\\\\Webtrees\\\\Report\\\\ReportParserBase\\), non\\-empty\\-string\\} given\\.$#"
 			count: 2
@@ -3060,11 +3060,6 @@ parameters:
 			count: 1
 			path: app/Report/ReportParserBase.php
 
-		-
-			message: "#^Array \\(array\\<string\\>\\) does not accept array\\<int, string\\>\\.$#"
-			count: 1
-			path: app/Report/ReportParserGenerate.php
-
 		-
 			message: "#^Call to function assert\\(\\) with false and LogicException will always evaluate to false\\.$#"
 			count: 1
@@ -3200,11 +3195,21 @@ parameters:
 			count: 1
 			path: app/Report/ReportParserGenerate.php
 
+		-
+			message: "#^Property Fisharebest\\\\Webtrees\\\\Report\\\\ReportParserGenerate\\:\\:\\$gedrec_stack \\(array\\<string\\>\\) does not accept array\\<array\\<int, string\\>\\|string\\>\\.$#"
+			count: 1
+			path: app/Report/ReportParserGenerate.php
+
 		-
 			message: "#^Property Fisharebest\\\\Webtrees\\\\Report\\\\ReportParserGenerate\\:\\:\\$list type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: app/Report/ReportParserGenerate.php
 
+		-
+			message: "#^Property Fisharebest\\\\Webtrees\\\\Report\\\\ReportParserGenerate\\:\\:\\$parser \\(XMLParser\\) does not accept XMLParser\\|null\\.$#"
+			count: 4
+			path: app/Report/ReportParserGenerate.php
+
 		-
 			message: "#^Property Fisharebest\\\\Webtrees\\\\Report\\\\ReportParserGenerate\\:\\:\\$parser \\(XMLParser\\) does not accept resource\\.$#"
 			count: 4
@@ -3225,6 +3230,16 @@ parameters:
 			count: 4
 			path: app/Report/ReportParserGenerate.php
 
+		-
+			message: "#^Property Fisharebest\\\\Webtrees\\\\Report\\\\ReportParserGenerate\\:\\:\\$repeat_bytes \\(int\\) does not accept array\\<string\\>\\|int\\.$#"
+			count: 4
+			path: app/Report/ReportParserGenerate.php
+
+		-
+			message: "#^Property Fisharebest\\\\Webtrees\\\\Report\\\\ReportParserGenerate\\:\\:\\$repeats \\(array\\<string\\>\\) does not accept array\\<string\\>\\|int\\.$#"
+			count: 4
+			path: app/Report/ReportParserGenerate.php
+
 		-
 			message: "#^Property Fisharebest\\\\Webtrees\\\\Report\\\\ReportParserGenerate\\:\\:\\$wt_report \\(Fisharebest\\\\Webtrees\\\\Report\\\\AbstractRenderer\\) does not accept Fisharebest\\\\Webtrees\\\\Report\\\\AbstractRenderer\\|null\\.$#"
 			count: 1