diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
index 1b9778bed..c23b2b536 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
@@ -863,11 +863,8 @@ class CRUDController extends AbstractController
      * * save-and-close: return to index of current crud ;
      * * save-and-new: return to new page of current crud ;
      * * save-and-view: return to view page of current crud ;
-     *
-     *
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
-    protected function onBeforeRedirectAfterSubmission(string $action, mixed $entity, FormInterface $form, Request $request)
+    protected function onBeforeRedirectAfterSubmission(string $action, mixed $entity, FormInterface $form, Request $request): ?Response
     {
         $next = $request->request->get('submit', 'save-and-close');
 
diff --git a/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepositoryInterface.php
index 6a51a9c0a..28ada8b69 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepositoryInterface.php
@@ -20,7 +20,7 @@ interface UserACLAwareRepositoryInterface
     /**
      * Find the users reaching the given center and scope, for the given role.
      *
-     * @param array|Center|Center[] $center
+     * @param array|Center|Center[]|null $center
      * @param array|Scope|Scope[]|null $scope
      * @param bool $onlyActive true if get only active users
      *
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
index 1bdb27b7f..70df849cc 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
@@ -167,7 +167,7 @@ abstract class AbstractAggregatorTest extends KernelTestCase
      *
      * This method is executed before the `setUp` method.
      *
-     * @return \Doctrine\DBAL\Query\QueryBuilder[]
+     * @return QueryBuilder[]
      */
     abstract public function getQueryBuilders();
 
diff --git a/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php b/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
index 398114363..1ed8f3a58 100644
--- a/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
+++ b/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
@@ -17,6 +17,7 @@ use Doctrine\ORM\QueryBuilder;
 use Exception;
 use Symfony\Component\HttpFoundation\Request;
 
+use Symfony\Component\HttpFoundation\Response;
 use function array_merge;
 
 /**
@@ -143,10 +144,8 @@ class EntityPersonCRUDController extends CRUDController
 
     /**
      * @param mixed $entity
-     *
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
-    protected function onBeforeRedirectAfterSubmission(string $action, $entity, \Symfony\Component\Form\FormInterface $form, Request $request)
+    protected function onBeforeRedirectAfterSubmission(string $action, $entity, \Symfony\Component\Form\FormInterface $form, Request $request): ?Response
     {
         $next = $request->request->get('submit', 'save-and-close');
 
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
index 7b31887b9..5e5f62ca3 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Repository;
 
+use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
@@ -23,6 +24,7 @@ interface AccompanyingPeriodACLAwareRepositoryInterface
     /**
      * @param array|UserJob[] $jobs
      * @param array|Scope[] $services
+     * @param array|Location[] $administrativeLocations
      */
     public function countByUnDispatched(array $jobs, array $services, array $administrativeLocations): int;
 
@@ -45,10 +47,10 @@ interface AccompanyingPeriodACLAwareRepositoryInterface
     /**
      * @param array|UserJob[] $jobs if empty, does not take this argument into account
      * @param array|Scope[] $services if empty, does not take this argument into account
-     *
+     * @param array|Location[] $administrativeLocations
      * @return list<AccompanyingPeriod>
      */
-    public function findByUnDispatched(array $jobs, array $services, array $administrativeAdministrativeLocations, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+    public function findByUnDispatched(array $jobs, array $services, array $administrativeLocations, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
 
     /**
      * @param array|PostalCode[] $postalCodes