diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index d5c859fee..e29ab2424 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -677,8 +677,8 @@ final class ActivityController extends AbstractController
                 throw $this->createNotFoundException('Accompanying Period not found');
             }
 
-        // TODO Add permission
-        // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+            // TODO Add permission
+            // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
         } else {
             throw $this->createNotFoundException('Person or Accompanying Period not found');
         }
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php
index bd47c0fd3..3de0cc65c 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php
@@ -34,7 +34,7 @@ use UnexpectedValueException;
 final readonly class CalendarDocController
 {
     public function __construct(
-        private EngineInterface $engine,
+        private \Twig\Environment $engine,
         private EntityManagerInterface $entityManager,
         private FormFactoryInterface $formFactory,
         private Security $security,
diff --git a/src/Bundle/ChillCustomFieldsBundle/config/services.yaml b/src/Bundle/ChillCustomFieldsBundle/config/services.yaml
index e1822e2cb..b415d7448 100644
--- a/src/Bundle/ChillCustomFieldsBundle/config/services.yaml
+++ b/src/Bundle/ChillCustomFieldsBundle/config/services.yaml
@@ -51,7 +51,7 @@ services:
             - "@chill.main.helper.translatable_string"
         tags:
             - { name: 'chill.custom_field', type: 'number' }
-            
+
     chill.form_extension.post_text_integer:
         class: Chill\CustomFieldsBundle\Form\Extension\PostTextIntegerExtension
         tags:
@@ -91,7 +91,7 @@ services:
             - "@chill.main.helper.translatable_string"
         tags:
             - { name: 'chill.custom_field', type: 'title' }
-            
+
     chill.custom_field.date:
         class: Chill\CustomFieldsBundle\CustomFields\CustomFieldDate
         arguments:
@@ -126,10 +126,11 @@ services:
 
     chill.custom_field.custom_field_long_choice:
         class: Chill\CustomFieldsBundle\CustomFields\CustomFieldLongChoice
+        autowire: true
+        autoconfigure: true
         arguments:
             - "@chill.custom_field.custom_field_long_choice_option_repository"
             - "@chill.main.helper.translatable_string"
-            - "@templating"
         tags:
             - { name: 'chill.custom_field', type: 'long_choice' }
 
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php
index 522cc57c5..414f9da6f 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php
@@ -30,7 +30,7 @@ final readonly class GenericDocForAccompanyingPeriodController
         private Manager $manager,
         private PaginatorFactory $paginator,
         private Security $security,
-        private EngineInterface $twig,
+        private \Twig\Environment $twig,
     ) {
     }
 
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php
index 3484e0904..38c4c1b09 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php
@@ -29,7 +29,7 @@ final readonly class GenericDocForPerson
         private Manager $manager,
         private PaginatorFactory $paginator,
         private Security $security,
-        private EngineInterface $twig,
+        private \Twig\Environment $twig,
     ) {
     }
 
diff --git a/src/Bundle/ChillEventBundle/Search/EventSearch.php b/src/Bundle/ChillEventBundle/Search/EventSearch.php
index 93a689c0e..3e22eb0c5 100644
--- a/src/Bundle/ChillEventBundle/Search/EventSearch.php
+++ b/src/Bundle/ChillEventBundle/Search/EventSearch.php
@@ -45,7 +45,7 @@ class EventSearch extends AbstractSearch
         private readonly Security $security,
         private readonly EventRepository $er,
         private readonly AuthorizationHelper $authorizationHelper,
-        private readonly TemplatingEngine $templating,
+        private readonly \Twig\Environment $templating,
         private readonly PaginatorFactory $paginationFactory
     ) {
     }
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
index 96ba1c74f..caa777da0 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
@@ -24,6 +24,7 @@ class PasswordRecoverEvent extends Event
 
     /**
      * @param bool $safelyGenerated true if generated safely (from console command, etc.)
+     * @param null|mixed $ip
      */
     public function __construct(
         private readonly ?string $token = null,
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
index e8a26d3fd..95100e3fb 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
@@ -102,7 +102,7 @@ class ThirdPartyType extends AbstractType
                     'label' => 'thirdparty.Contact data are confidential',
                 ]);
 
-        // Institutional ThirdParty (parent)
+            // Institutional ThirdParty (parent)
         } else {
             $builder
                 ->add('nameCompany', TextType::class, [