diff --git a/src/Controller/AdminPages/BaseAdminController.php b/src/Controller/AdminPages/BaseAdminController.php
index c625da0d..b17b081c 100644
--- a/src/Controller/AdminPages/BaseAdminController.php
+++ b/src/Controller/AdminPages/BaseAdminController.php
@@ -96,7 +96,7 @@ abstract class BaseAdminController extends AbstractController
     protected $timeTravel;
     protected $dataTableFactory;
     /**
-     * @var EventDispatcher
+     * @var EventDispatcher|EventDispatcherInterface
      */
     protected $eventDispatcher;
     protected $labelGenerator;
diff --git a/src/Controller/UserSettingsController.php b/src/Controller/UserSettingsController.php
index 4b64a5df..623e4061 100644
--- a/src/Controller/UserSettingsController.php
+++ b/src/Controller/UserSettingsController.php
@@ -73,7 +73,7 @@ class UserSettingsController extends AbstractController
 {
     protected $demo_mode;
     /**
-     * @var EventDispatcher
+     * @var EventDispatcher|EventDispatcherInterface
      */
     protected $eventDispatcher;
 
diff --git a/src/Entity/Base/TimestampTrait.php b/src/Entity/Base/TimestampTrait.php
index f7a7a88f..c34c2cea 100644
--- a/src/Entity/Base/TimestampTrait.php
+++ b/src/Entity/Base/TimestampTrait.php
@@ -51,14 +51,14 @@ use Symfony\Component\Serializer\Annotation\Groups;
 trait TimestampTrait
 {
     /**
-     * @var DateTime the date when this element was modified the last time
+     * @var DateTime|null the date when this element was modified the last time
      * @ORM\Column(type="datetime", name="last_modified", options={"default"="CURRENT_TIMESTAMP"})
      * @Groups({"extended", "full"})
      */
     protected $lastModified;
 
     /**
-     * @var DateTime the date when this element was created
+     * @var DateTime|null the date when this element was created
      * @ORM\Column(type="datetime", name="datetime_added", options={"default"="CURRENT_TIMESTAMP"})
      * @Groups({"extended", "full"})
      */
diff --git a/src/Entity/Parameters/ParametersTrait.php b/src/Entity/Parameters/ParametersTrait.php
index 7b75f168..6e957b0a 100644
--- a/src/Entity/Parameters/ParametersTrait.php
+++ b/src/Entity/Parameters/ParametersTrait.php
@@ -39,7 +39,7 @@ trait ParametersTrait
     /**
      *  Return all associated specifications.
      *
-     * @psalm-return Collection<int, PartParameter>
+     * @psalm-return Collection<int, AbstractParameter>
      */
     public function getParameters(): Collection
     {
diff --git a/src/Entity/PriceInformations/Pricedetail.php b/src/Entity/PriceInformations/Pricedetail.php
index 22b0be49..6b7d0a1c 100644
--- a/src/Entity/PriceInformations/Pricedetail.php
+++ b/src/Entity/PriceInformations/Pricedetail.php
@@ -77,7 +77,7 @@ class Pricedetail extends AbstractDBElement implements TimeStampableInterface
     public const PRICE_PRECISION = 5;
 
     /**
-     * @var string The price related to the detail. (Given in the selected currency)
+     * @var BigDecimal The price related to the detail. (Given in the selected currency)
      * @ORM\Column(type="big_decimal", precision=11, scale=5)
      * @BigDecimalPositive()
      */
diff --git a/src/EventSubscriber/UserSystem/RegisterU2FSubscriber.php b/src/EventSubscriber/UserSystem/RegisterU2FSubscriber.php
index b1695112..17ab0a36 100644
--- a/src/EventSubscriber/UserSystem/RegisterU2FSubscriber.php
+++ b/src/EventSubscriber/UserSystem/RegisterU2FSubscriber.php
@@ -71,7 +71,7 @@ final class RegisterU2FSubscriber implements EventSubscriberInterface
     private $router;
 
     /**
-     * @var EventDispatcher
+     * @var EventDispatcher|EventDispatcherInterface
      */
     private $eventDispatcher;
 
diff --git a/src/Form/AdminPages/BaseEntityAdminForm.php b/src/Form/AdminPages/BaseEntityAdminForm.php
index 37cd38ff..8e89ac96 100644
--- a/src/Form/AdminPages/BaseEntityAdminForm.php
+++ b/src/Form/AdminPages/BaseEntityAdminForm.php
@@ -79,7 +79,7 @@ class BaseEntityAdminForm extends AbstractType
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        /** @var AbstractStructuralDBElement $entity */
+        /** @var AbstractStructuralDBElement|LabelProfile|AbstractNamedDBElement $entity */
         $entity = $options['data'];
         $is_new = null === $entity->getID();
 
diff --git a/src/Helpers/BigDecimalType.php b/src/Helpers/BigDecimalType.php
index 0c963088..4934e543 100644
--- a/src/Helpers/BigDecimalType.php
+++ b/src/Helpers/BigDecimalType.php
@@ -34,7 +34,7 @@ class BigDecimalType extends Type
     }
 
     /**
-     * @param string $value
+     * @param string|null $value
      *
      * @return BigDecimal|\Brick\Math\BigNumber|mixed
      */
@@ -48,7 +48,7 @@ class BigDecimalType extends Type
     }
 
     /**
-     * @param BigDecimal $value
+     * @param BigDecimal|null $value
      */
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
diff --git a/src/Services/Parts/PartsTableActionHandler.php b/src/Services/Parts/PartsTableActionHandler.php
index 3f83d994..96120772 100644
--- a/src/Services/Parts/PartsTableActionHandler.php
+++ b/src/Services/Parts/PartsTableActionHandler.php
@@ -26,6 +26,7 @@ use App\Entity\Parts\Manufacturer;
 use App\Entity\Parts\MeasurementUnit;
 use App\Entity\Parts\Part;
 use App\Repository\DBElementRepository;
+use App\Repository\PartRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Security;
@@ -52,7 +53,7 @@ final class PartsTableActionHandler
     {
         $id_array = explode(',', $ids);
 
-        /** @var DBElementRepository $repo */
+        /** @var PartRepository $repo */
         $repo = $this->entityManager->getRepository(Part::class);
 
         return $repo->getElementsFromIDArray($id_array);