diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index 008fbf6be1..aeabd12915 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -67,6 +67,8 @@ protected function handleSortControlSubmit()
      * @param   string  $message    Exception message or exception format string
      * @param   mixed   ...$arg     Format string argument
      *
+     * @return never
+     *
      * @throws  HttpBadRequestException
      */
     public function httpBadRequest($message)
@@ -80,6 +82,8 @@ public function httpBadRequest($message)
      * @param   string  $message    Exception message or exception format string
      * @param   mixed   ...$arg     Format string argument
      *
+     * @return never
+     *
      * @throws  HttpNotFoundException
      */
     public function httpNotFound($message)
diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index a367f0082f..76fac125dc 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -31,7 +31,7 @@ class Tab extends AbstractWidget
     /**
      * Default values for widget properties
      *
-     * @var array
+     * @var ?string
      */
     private $name = null;
 
@@ -122,7 +122,7 @@ public function setIconCls($iconCls)
     }
 
     /**
-     * @param mixed $name
+     * @param string $name
      */
     public function setName($name)
     {
@@ -130,7 +130,7 @@ public function setName($name)
     }
 
     /**
-     * @return mixed
+     * @return ?string
      */
     public function getName()
     {
@@ -162,7 +162,7 @@ public function getLabel()
     }
 
     /**
-     * @param mixed $title
+     * @param string $title
      */
     public function setTitle($title)
     {
diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index 9efa423532..d29a817510 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -75,7 +75,7 @@ class Tabs extends AbstractWidget implements Countable
     /**
      * This is where single tabs added to this container will be stored
      *
-     * @var array
+     * @var array<string, Tab>
      */
     private $tabs = array();
 
@@ -419,7 +419,7 @@ public function count(): int
     /**
      * Return all tabs contained in this tab panel
      *
-     * @return array
+     * @return array<string, Tab>
      */
     public function getTabs()
     {