diff --git a/main/work/downloadfolder.inc.php b/main/work/downloadfolder.inc.php
index 6deb26046b..fc36aba045 100644
--- a/main/work/downloadfolder.inc.php
+++ b/main/work/downloadfolder.inc.php
@@ -81,7 +81,7 @@ if (api_is_allowed_to_edit()) {
         // Do another filter
     } else {
         // Only teachers
-        $userCondition = " AND props.insert_user_id='".api_get_user_id();
+        $userCondition = " AND props.insert_user_id = ".api_get_user_id();
     }
 
     //for other users, we need to create a zipfile with only visible files and folders
@@ -95,7 +95,7 @@ if (api_is_allowed_to_edit()) {
                     work.accepted = 1 AND
                     work.active = 1 AND
                     work.parent_id = $work_id AND
-                    work.filetype='file' AND
+                    work.filetype = 'file' AND
                     props.visibility = '1' AND
                     work.post_group_id = $groupId
                     $userCondition
diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index dc9f5a9996..b42c60bc96 100644
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -14,7 +14,6 @@
  * Initialization
  */
 require_once api_get_path(SYS_CODE_PATH).'document/document.inc.php';
-require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
 
 if (isset($_configuration['add_document_to_work'])) {
diff --git a/main/work/work.php b/main/work/work.php
index 59a5a07926..bca9b0df7b 100644
--- a/main/work/work.php
+++ b/main/work/work.php
@@ -55,11 +55,6 @@ api_protect_course_script(true);
 // Including necessary files
 require_once 'work.lib.php';
 
-require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
-require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
-require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
-require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
-
 $course_id      = api_get_course_int_id();
 $course_info    = api_get_course_info();
 $user_id 	    = api_get_user_id();