diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index be10aeb0..143fbfc8 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -45,11 +45,31 @@ parameters:
 			count: 1
 			path: src/Common/StateBadges.php
 
+		-
+			message: "#^Call to an undefined method Icinga\\\\Web\\\\Request\\:\\:getPathInfo\\(\\)\\.$#"
+			count: 1
+			path: src/Compat/CompatController.php
+
+		-
+			message: "#^Call to an undefined method Icinga\\\\Web\\\\Request\\:\\:setPathInfo\\(\\)\\.$#"
+			count: 2
+			path: src/Compat/CompatController.php
+
+		-
+			message: "#^Call to an undefined method Icinga\\\\Web\\\\Response\\:\\:setHeader\\(\\)\\.$#"
+			count: 3
+			path: src/Compat/CompatController.php
+
 		-
 			message: "#^Method ipl\\\\Web\\\\Compat\\\\CompatController\\:\\:createSortControl\\(\\) has parameter \\$columns with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: src/Compat/CompatController.php
 
+		-
+			message: "#^Method ipl\\\\Web\\\\Compat\\\\CompatController\\:\\:postDispatch\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/Compat/CompatController.php
+
 		-
 			message: "#^Method ipl\\\\Web\\\\Compat\\\\CompatController\\:\\:prepareInit\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -101,8 +121,48 @@ parameters:
 			path: src/Compat/Multipart.php
 
 		-
-			message: "#^Access to an undefined property Zend_View_Interface\\:\\:\\$document\\.$#"
-			count: 2
+			message: "#^Access to an undefined property ipl\\\\Web\\\\Compat\\\\ViewRenderer\\:\\:\\$view\\.$#"
+			count: 1
+			path: src/Compat/ViewRenderer.php
+
+		-
+			message: "#^Call to an undefined method ipl\\\\Web\\\\Compat\\\\ViewRenderer\\:\\:getRequest\\(\\)\\.$#"
+			count: 1
+			path: src/Compat/ViewRenderer.php
+
+		-
+			message: "#^Call to an undefined method ipl\\\\Web\\\\Compat\\\\ViewRenderer\\:\\:getResponse\\(\\)\\.$#"
+			count: 1
+			path: src/Compat/ViewRenderer.php
+
+		-
+			message: "#^Call to an undefined method ipl\\\\Web\\\\Compat\\\\ViewRenderer\\:\\:getResponseSegment\\(\\)\\.$#"
+			count: 1
+			path: src/Compat/ViewRenderer.php
+
+		-
+			message: "#^Call to an undefined method ipl\\\\Web\\\\Compat\\\\ViewRenderer\\:\\:setNoRender\\(\\)\\.$#"
+			count: 1
+			path: src/Compat/ViewRenderer.php
+
+		-
+			message: "#^Call to static method addHelper\\(\\) on an unknown class Zend_Controller_Action_HelperBroker\\.$#"
+			count: 1
+			path: src/Compat/ViewRenderer.php
+
+		-
+			message: "#^Call to static method getStaticHelper\\(\\) on an unknown class Zend_Controller_Action_HelperBroker\\.$#"
+			count: 1
+			path: src/Compat/ViewRenderer.php
+
+		-
+			message: "#^Call to static method removeHelper\\(\\) on an unknown class Zend_Controller_Action_HelperBroker\\.$#"
+			count: 1
+			path: src/Compat/ViewRenderer.php
+
+		-
+			message: "#^Method ipl\\\\Web\\\\Compat\\\\ViewRenderer\\:\\:getName\\(\\) has no return type specified\\.$#"
+			count: 1
 			path: src/Compat/ViewRenderer.php
 
 		-
@@ -110,6 +170,36 @@ parameters:
 			count: 1
 			path: src/Compat/ViewRenderer.php
 
+		-
+			message: "#^Method ipl\\\\Web\\\\Compat\\\\ViewRenderer\\:\\:render\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/Compat/ViewRenderer.php
+
+		-
+			message: "#^Method ipl\\\\Web\\\\Compat\\\\ViewRenderer\\:\\:render\\(\\) has parameter \\$action with no type specified\\.$#"
+			count: 1
+			path: src/Compat/ViewRenderer.php
+
+		-
+			message: "#^Method ipl\\\\Web\\\\Compat\\\\ViewRenderer\\:\\:render\\(\\) has parameter \\$name with no type specified\\.$#"
+			count: 1
+			path: src/Compat/ViewRenderer.php
+
+		-
+			message: "#^Method ipl\\\\Web\\\\Compat\\\\ViewRenderer\\:\\:render\\(\\) has parameter \\$noController with no type specified\\.$#"
+			count: 1
+			path: src/Compat/ViewRenderer.php
+
+		-
+			message: "#^PHPDoc tag @var for variable \\$viewRenderer contains unknown class Zend_Controller_Action_Helper_ViewRenderer\\.$#"
+			count: 1
+			path: src/Compat/ViewRenderer.php
+
+		-
+			message: "#^ipl\\\\Web\\\\Compat\\\\ViewRenderer\\:\\:render\\(\\) calls parent\\:\\:render\\(\\) but ipl\\\\Web\\\\Compat\\\\ViewRenderer does not extend any class\\.$#"
+			count: 1
+			path: src/Compat/ViewRenderer.php
+
 		-
 			message: "#^Method ipl\\\\Web\\\\Control\\\\LimitControl\\:\\:assemble\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -155,6 +245,11 @@ parameters:
 			count: 1
 			path: src/Control/PaginationControl.php
 
+		-
+			message: "#^Variable \\$currentPageNumber might not be defined\\.$#"
+			count: 1
+			path: src/Control/PaginationControl.php
+
 		-
 			message: "#^Access to an undefined property ipl\\\\Html\\\\Form\\:\\:\\$uidElementName\\.$#"
 			count: 3
@@ -167,7 +262,7 @@ parameters:
 
 		-
 			message: "#^Cannot access offset 'terms' on mixed\\.$#"
-			count: 2
+			count: 1
 			path: src/Control/SearchBar.php
 
 		-
@@ -175,11 +270,6 @@ parameters:
 			count: 2
 			path: src/Control/SearchBar.php
 
-		-
-			message: "#^Cannot access offset mixed on array\\|object\\.$#"
-			count: 1
-			path: src/Control/SearchBar.php
-
 		-
 			message: "#^Cannot call method getHeaderLine\\(\\) on Psr\\\\Http\\\\Message\\\\ServerRequestInterface\\|null\\.$#"
 			count: 1
@@ -247,7 +337,7 @@ parameters:
 
 		-
 			message: "#^Cannot access offset 'column' on mixed\\.$#"
-			count: 3
+			count: 1
 			path: src/Control/SearchBar/Suggestions.php
 
 		-
@@ -257,7 +347,7 @@ parameters:
 
 		-
 			message: "#^Cannot access offset 'operator' on mixed\\.$#"
-			count: 2
+			count: 1
 			path: src/Control/SearchBar/Suggestions.php
 
 		-
@@ -267,12 +357,12 @@ parameters:
 
 		-
 			message: "#^Cannot access offset 'searchFilter' on mixed\\.$#"
-			count: 2
+			count: 1
 			path: src/Control/SearchBar/Suggestions.php
 
 		-
 			message: "#^Cannot access offset 'showQuickSearch' on mixed\\.$#"
-			count: 2
+			count: 1
 			path: src/Control/SearchBar/Suggestions.php
 
 		-
@@ -685,11 +775,6 @@ parameters:
 			count: 3
 			path: src/Control/SortControl.php
 
-		-
-			message: "#^Cannot access offset mixed on array\\|object\\.$#"
-			count: 1
-			path: src/Control/SortControl.php
-
 		-
 			message: "#^Cannot call method getParsedBody\\(\\) on Psr\\\\Http\\\\Message\\\\ServerRequestInterface\\|null\\.$#"
 			count: 1