diff --git a/public/main/admin/course_edit.php b/public/main/admin/course_edit.php
index c7bf997bf0..85f0517f33 100644
--- a/public/main/admin/course_edit.php
+++ b/public/main/admin/course_edit.php
@@ -213,7 +213,7 @@ if (!empty($coursesInSession) && $allowEditSessionCoaches) {
         $form->addMultiSelect(
             $groupName,
             Display::url(
-                $session['name'],
+                $session['title'],
                 $sessionUrl,
                 ['target' => '_blank']
             ).' - '.get_lang('Coaches'),
diff --git a/public/main/survey/survey.lib.php b/public/main/survey/survey.lib.php
index ac82b06358..ce14f8b314 100644
--- a/public/main/survey/survey.lib.php
+++ b/public/main/survey/survey.lib.php
@@ -324,9 +324,6 @@ class SurveyManager
                 }
             }
 
-            $from = api_get_utc_datetime($values['start_date'].':00', true, true);
-            $until = api_get_utc_datetime($values['end_date'].':59', true, true);
-
             $course = api_get_course_entity();
             $session = api_get_session_entity();
 
@@ -335,8 +332,8 @@ class SurveyManager
                 ->setTitle($values['survey_title'])
                 ->setSubtitle($values['survey_title'])
                 ->setLang($values['survey_language'])
-                ->setAvailFrom($from)
-                ->setAvailTill($until)
+                ->setAvailFrom(new \DateTime($values['start_date']))
+                ->setAvailTill(new \DateTime($values['end_date']))
                 ->setIsShared($shared_survey_id)
                 ->setTemplate('template')
                 ->setIntro($values['survey_introduction'])
@@ -442,8 +439,8 @@ class SurveyManager
                 ->setTitle($values['survey_title'])
                 ->setSubtitle($values['survey_title'])
                 ->setLang($values['survey_language'])
-                ->setAvailFrom(api_get_utc_datetime($values['start_date'].' 00:00', true, true))
-                ->setAvailTill(api_get_utc_datetime($values['end_date'].' 23:59', true, true))
+                ->setAvailFrom(new \DateTime($values['start_date']))
+                ->setAvailTill(new \DateTime($values['end_date']))
                 ->setIsShared($shared_survey_id)
                 ->setTemplate('template')
                 ->setIntro($values['survey_introduction'])
diff --git a/src/CoreBundle/Entity/GradebookCategory.php b/src/CoreBundle/Entity/GradebookCategory.php
index 990eaf5d6d..6f0ccca8b1 100644
--- a/src/CoreBundle/Entity/GradebookCategory.php
+++ b/src/CoreBundle/Entity/GradebookCategory.php
@@ -53,7 +53,7 @@ class GradebookCategory
     #[ORM\Column(name: 'description', type: 'text', nullable: true)]
     protected ?string $description;
 
-    #[ORM\ManyToOne(targetEntity: User::class, inversedBy: 'gradeBookCategories')]
+    #[ORM\ManyToOne(targetEntity: User::class, inversedBy: 'gradeBookCategories', cascade: ['persist'])]
     #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', onDelete: 'CASCADE')]
     protected User $user;
 
diff --git a/src/CourseBundle/Entity/CSurveyInvitation.php b/src/CourseBundle/Entity/CSurveyInvitation.php
index e960ec7dfa..6a229799a8 100644
--- a/src/CourseBundle/Entity/CSurveyInvitation.php
+++ b/src/CourseBundle/Entity/CSurveyInvitation.php
@@ -35,11 +35,11 @@ class CSurveyInvitation
     protected ?CGroup $group = null;
 
     #[ORM\ManyToOne(targetEntity: CSurvey::class, inversedBy: 'invitations')]
-    #[ORM\JoinColumn(name: 'survey_id', referencedColumnName: 'iid')]
+    #[ORM\JoinColumn(name: 'survey_id', referencedColumnName: 'iid', onDelete: 'SET NULL')]
     protected CSurvey $survey;
 
     #[ORM\ManyToOne(targetEntity: User::class, inversedBy: 'surveyInvitations')]
-    #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', onDelete: 'CASCADE')]
+    #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', onDelete: 'SET NULL')]
     protected User $user;
 
     protected string $externalEmail;
diff --git a/src/CourseBundle/Entity/CSurveyQuestionOption.php b/src/CourseBundle/Entity/CSurveyQuestionOption.php
index 045626fb68..36b89ddf01 100644
--- a/src/CourseBundle/Entity/CSurveyQuestionOption.php
+++ b/src/CourseBundle/Entity/CSurveyQuestionOption.php
@@ -19,7 +19,7 @@ class CSurveyQuestionOption
     protected ?int $iid = null;
 
     #[ORM\ManyToOne(targetEntity: CSurveyQuestion::class, inversedBy: 'options')]
-    #[ORM\JoinColumn(name: 'question_id', referencedColumnName: 'iid', onDelete: 'CASCADE')]
+    #[ORM\JoinColumn(name: 'question_id', referencedColumnName: 'iid', onDelete: 'SET NULL')]
     protected CSurveyQuestion $question;
 
     #[ORM\ManyToOne(targetEntity: CSurvey::class, inversedBy: 'options')]