diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 97feba34..c96cf147 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -20,28 +20,9 @@ parameters:
 			count: 1
 			path: src/AbstractFactoryInterface.php
 
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(\\$instance\\)\\: Unexpected token \"\\$instance\", expected type at offset 43$#"
-			count: 1
-			path: src/InitializerInterface.php
-
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(bool\\)\\: Unexpected token \"\\\\n     \", expected variable at offset 89$#"
-			count: 1
-			path: src/ServiceManager.php
-
 		-
 			message: "#^Closure invoked with 4 parameters, 0 required\\.$#"
 			count: 1
 			path: src/ServiceManager.php
 
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(\\$className\\)\\: Unexpected token \"\\$className\", expected type at offset 18$#"
-			count: 1
-			path: src/Tool/ConfigDumper.php
-
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(\\$className\\)\\: Unexpected token \"\\$className\", expected type at offset 18$#"
-			count: 1
-			path: src/Tool/FactoryCreator.php
 
diff --git a/src/InitializerInterface.php b/src/InitializerInterface.php
index d434b493..1bfc0616 100644
--- a/src/InitializerInterface.php
+++ b/src/InitializerInterface.php
@@ -33,7 +33,7 @@ interface InitializerInterface extends Initializer\InitializerInterface
     /**
      * Initialize
      *
-     * @param $instance
+     * @param object $instance
      * @param ServiceLocatorInterface $serviceLocator
      * @return mixed
      */
diff --git a/src/ServiceManager.php b/src/ServiceManager.php
index 907fe79d..7996d94f 100644
--- a/src/ServiceManager.php
+++ b/src/ServiceManager.php
@@ -70,7 +70,7 @@ class ServiceManager implements ServiceLocatorInterface
     /**
      * Whether or not changes may be made to this instance.
      *
-     * @param bool
+     * @var bool
      */
     protected $allowOverride = false;
 
diff --git a/src/Tool/ConfigDumper.php b/src/Tool/ConfigDumper.php
index 77586f7d..7c773dac 100644
--- a/src/Tool/ConfigDumper.php
+++ b/src/Tool/ConfigDumper.php
@@ -123,7 +123,8 @@ function (ReflectionParameter $argument) {
     }
 
     /**
-     * @param $className
+     * @param string $className
+     * @psalm-param class-string $className
      * @throws InvalidArgumentException if class name is not a string or does
      *     not exist.
      */
diff --git a/src/Tool/FactoryCreator.php b/src/Tool/FactoryCreator.php
index 689738db..a316798f 100644
--- a/src/Tool/FactoryCreator.php
+++ b/src/Tool/FactoryCreator.php
@@ -77,7 +77,8 @@ public function createFactory($className)
     }
 
     /**
-     * @param $className
+     * @param string $className
+     * @psalm-param class-string $className
      * @return string
      */
     private function getClassName($className)