diff --git a/TODO.md b/TODO.md
index 3265c4c..8dd6bb3 100644
--- a/TODO.md
+++ b/TODO.md
@@ -12,6 +12,8 @@
 ## Bug fixes
 
 - [x] Fix `$enabledAccessTypes` undefined / `array_map()` TypeError on edit page — controller was fetching `getAccessTypes()` instead of `getEnabledFormAccessTypes()` and returning it under the wrong key
+- [x] Fix fatal TypeError: `old()` called with wrong arity in `jury-fieldset.php` partial under partage context — removed `?: null` coercions so `$juryPresident`/`$juryPromoteur` are `''` not `null`, keeping `$addMode` false
+- [x] Fix `$formData` destroyed by included partials (`fieldset-academic.php`, `fieldset-metadata.php`, `fieldset-licence-explanation.php` were incorrectly unsetting `$formData`/wrong variable in caller scope)
 
 ## Form help blocks — sortable admin UI
 
diff --git a/app/templates/partials/form/fieldset-academic.php b/app/templates/partials/form/fieldset-academic.php
index 44d7f87..62935fb 100644
--- a/app/templates/partials/form/fieldset-academic.php
+++ b/app/templates/partials/form/fieldset-academic.php
@@ -59,4 +59,4 @@ $formData        = $formData        ?? [];
     ?>
 </fieldset>
 <?php
-unset($oldFn, $withAutofocusFn, $formData);
+unset($oldFn, $withAutofocusFn);
diff --git a/app/templates/partials/form/fieldset-licence-explanation.php b/app/templates/partials/form/fieldset-licence-explanation.php
index 4f9f219..f8c90a2 100644
--- a/app/templates/partials/form/fieldset-licence-explanation.php
+++ b/app/templates/partials/form/fieldset-licence-explanation.php
@@ -58,4 +58,4 @@ $formData = $formData ?? [];
     </div>
 </fieldset>
 <?php
-unset($formData);
+unset($n);
diff --git a/app/templates/partials/form/fieldset-metadata.php b/app/templates/partials/form/fieldset-metadata.php
index 2128719..5b2fe04 100644
--- a/app/templates/partials/form/fieldset-metadata.php
+++ b/app/templates/partials/form/fieldset-metadata.php
@@ -60,4 +60,4 @@ $selectedAccessType = isset($formData['access_type_id'])
     ?>
 </fieldset>
 <?php
-unset($oldFn, $withAutofocusFn, $formData, $defaultAccessTypeId, $showDescription, $accessOptions, $selectedAccessType);
+unset($oldFn, $withAutofocusFn, $defaultAccessTypeId, $showDescription, $accessOptions, $selectedAccessType);