diff --git a/public/main/exercise/exercise.class.php b/public/main/exercise/exercise.class.php
index b03fadf6d1..e4632b768e 100644
--- a/public/main/exercise/exercise.class.php
+++ b/public/main/exercise/exercise.class.php
@@ -9443,7 +9443,7 @@ class Exercise
                     if ($returnData) {
                         $currentRow['id'] = $exercise->id;
                         $currentRow['url'] = $webPath.'exercise/overview.php?'
-                            .api_get_cidreq_params($courseId, $sessionId).'&'
+                            .api_get_cidreq().'&'
                             ."$mylpid$mylpitemid&exerciseId={$exercise->id}";
                         $currentRow['name'] = $currentRow[0];
                     }
diff --git a/public/main/inc/lib/certificate.lib.php b/public/main/inc/lib/certificate.lib.php
index d342ff3437..ad543b64f5 100644
--- a/public/main/inc/lib/certificate.lib.php
+++ b/public/main/inc/lib/certificate.lib.php
@@ -676,6 +676,10 @@ class Certificate extends Model
         }
         $tplContent->assign('terms_validation_date', $termsValidationDate);
 
+        if (empty($totalTimeInLearningPaths)) {
+            $totalTimeInLearningPaths = $timeInSeconds;
+        }
+
         // Ofaj
         $tplContent->assign('time_in_platform_in_hours', round($timeInSeconds/3600, 1));
         $tplContent->assign(
diff --git a/src/CoreBundle/EventListener/CourseListener.php b/src/CoreBundle/EventListener/CourseListener.php
index f84602a220..73a9c735b8 100644
--- a/src/CoreBundle/EventListener/CourseListener.php
+++ b/src/CoreBundle/EventListener/CourseListener.php
@@ -143,6 +143,7 @@ class CourseListener implements EventSubscriberInterface
                     $sessionHandler->set('session_name', $session->getTitle());
                     $sessionHandler->set('sid', $session->getId());
                     $sessionHandler->set('session', $session);
+                    ChamiloSession::write('sid', $session->getId());
 
                     $twig->addGlobal('session', $session);
                 } else {