diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 6d77373582..3ed4be3a76 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -2,6 +2,7 @@
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
+use Chamilo\CourseBundle\Entity\CItemProperty;
 
 /**
  * This is a code library for Chamilo.
@@ -3717,7 +3718,7 @@ function api_item_property_update(
         $startVisibleDate = !empty($start_visible) ? new DateTime($start_visible, new DateTimeZone('UTC')) : null;
         $endVisibleDate = !empty($endVisibleDate) ? new DateTime($endVisibleDate, new DateTimeZone('UTC')) : null;
 
-        $cItemProperty = new \Chamilo\CourseBundle\Entity\CItemProperty($objCourse);
+        $cItemProperty = new CItemProperty($objCourse);
         $cItemProperty
             ->setTool($tool)
             ->setRef($item_id)
diff --git a/src/Chamilo/CourseBundle/Component/CourseCopy/CourseArchiver.php b/src/Chamilo/CourseBundle/Component/CourseCopy/CourseArchiver.php
index 80e4cd71ac..46e8cde16f 100644
--- a/src/Chamilo/CourseBundle/Component/CourseCopy/CourseArchiver.php
+++ b/src/Chamilo/CourseBundle/Component/CourseCopy/CourseArchiver.php
@@ -42,17 +42,18 @@ class CourseArchiver
     public static function cleanBackupDir()
     {
         $dir = self::getBackupDir();
-
-        if ($handle = @ opendir($dir)) {
-            while (($file = readdir($handle)) !== false) {
-                if ($file != "." && $file != ".." &&
-                    strpos($file, 'CourseArchiver_') === 0 &&
-                    is_dir($dir . '/' . $file)
-                ) {
-                    rmdirr($dir . '/' . $file);
+        if (is_dir($dir)) {
+            if ($handle = @ opendir($dir)) {
+                while (($file = readdir($handle)) !== false) {
+                    if ($file != "." && $file != ".." &&
+                        strpos($file, 'CourseArchiver_') === 0 &&
+                        is_dir($dir.'/'.$file)
+                    ) {
+                        rmdirr($dir.'/'.$file);
+                    }
                 }
+                closedir($handle);
             }
-            closedir($handle);
         }
     }