diff --git a/main/gradebook/lib/GradebookUtils.php b/main/gradebook/lib/GradebookUtils.php
index 2fcef0d549..11fc59ca0f 100644
--- a/main/gradebook/lib/GradebookUtils.php
+++ b/main/gradebook/lib/GradebookUtils.php
@@ -1188,6 +1188,7 @@ class GradebookUtils
      * returns users within a course given by param.
      *
      * @param string $courseCode
+     * @deprecated use CourseManager
      *
      * @return array
      */
@@ -1218,7 +1219,7 @@ class GradebookUtils
             $sql = 'SELECT user.user_id, user.username, lastname, firstname, official_code
                     FROM '.$tbl_course_user.' as course_rel_user 
                     INNER JOIN '.$tbl_user.' as user
-                    ON (course_rel_user.user_id=user.user_id)
+                    ON (course_rel_user.user_id = user.id)
                     WHERE
                         course_rel_user.status = '.STUDENT.' AND
                         course_rel_user.c_id = "'.$courseId.'" '.
diff --git a/main/gradebook/lib/fe/linkaddeditform.class.php b/main/gradebook/lib/fe/linkaddeditform.class.php
index 823e667c1e..57282f3d6b 100755
--- a/main/gradebook/lib/fe/linkaddeditform.class.php
+++ b/main/gradebook/lib/fe/linkaddeditform.class.php
@@ -11,8 +11,8 @@
  */
 class LinkAddEditForm extends FormValidator
 {
-    const TYPE_ADD = 1;
-    const TYPE_EDIT = 2;
+    public const TYPE_ADD = 1;
+    public const TYPE_EDIT = 2;
 
     /**
      * Constructor
diff --git a/main/gradebook/lib/fe/userform.class.php b/main/gradebook/lib/fe/userform.class.php
index dea21e265b..93c41a2724 100755
--- a/main/gradebook/lib/fe/userform.class.php
+++ b/main/gradebook/lib/fe/userform.class.php
@@ -11,8 +11,8 @@
  */
 class UserForm extends FormValidator
 {
-    const TYPE_USER_INFO = 1;
-    const TYPE_SIMPLE_SEARCH = 3;
+    public const TYPE_USER_INFO = 1;
+    public const TYPE_SIMPLE_SEARCH = 3;
 
     /**
      * Builds a form containing form items based on a given parameter.
diff --git a/main/inc/lib/pdf.lib.php b/main/inc/lib/pdf.lib.php
index e09cd4f0cd..ebba1d435a 100755
--- a/main/inc/lib/pdf.lib.php
+++ b/main/inc/lib/pdf.lib.php
@@ -123,6 +123,8 @@ class PDF
         // Assignments
         $tpl->assign('pdf_content', $content);
 
+        $teacher_list = [];
+
         // Showing only the current teacher/admin instead the all teacher list name see BT#4080
         if (isset($this->params['show_real_course_teachers']) &&
             $this->params['show_real_course_teachers']