diff --git a/Dispatcher/Dispatcher.php b/Dispatcher/Dispatcher.php
index e0bd401ed..f34f2a583 100644
--- a/Dispatcher/Dispatcher.php
+++ b/Dispatcher/Dispatcher.php
@@ -32,7 +32,7 @@ final class Dispatcher
     /**
      * Application.
      *
-     * @var ApplicationAbstract
+     * @var ApplicationAbstract|null
      * @since 1.0.0
      */
     private $app = null;
@@ -54,7 +54,7 @@ final class Dispatcher
      *
      * @since  1.0.0
      */
-    public function __construct(ApplicationAbstract $app = null)
+    public function __construct(ApplicationAbstract $app)
     {
         $this->app = $app;
     }
diff --git a/Math/Statistic/MeasureOfDispersion.php b/Math/Statistic/MeasureOfDispersion.php
index f4b9337e5..9ac55737e 100644
--- a/Math/Statistic/MeasureOfDispersion.php
+++ b/Math/Statistic/MeasureOfDispersion.php
@@ -235,11 +235,11 @@ final class MeasureOfDispersion
             --$count;
         }
 
-        /** @var int $count */
         $count /= 2;
 
         \sort($x);
 
+        /** @var int $count */
         $Q1 = Average::median(\array_slice($x, 0, $count));
         $Q3 = Average::median(\array_slice($x, -$count, $count));
 
diff --git a/Module/ModuleManager.php b/Module/ModuleManager.php
index c0e463930..77d8a0187 100644
--- a/Module/ModuleManager.php
+++ b/Module/ModuleManager.php
@@ -135,7 +135,7 @@ final class ModuleManager
      *
      * @param RequestAbstract $request Request
      *
-     * @return array<string, array>
+     * @return array<string|int, array>
      *
      * @since  1.0.0
      */