diff --git a/main/inc/lib/groupmanager.lib.php b/main/inc/lib/groupmanager.lib.php
index a30ac8e8a9..61df3fe690 100644
--- a/main/inc/lib/groupmanager.lib.php
+++ b/main/inc/lib/groupmanager.lib.php
@@ -227,7 +227,7 @@ class GroupManager {
 		$my_path = api_get_path(SYS_COURSE_PATH).$currentCourseRepository.'/document';
 		$unique_name = create_unexisting_directory($_course,$_user['user_id'], api_get_session_id(), $lastId,NULL,$my_path, $desired_dir_name);
 		/* Stores the directory path into the group table */
-		$sql = "UPDATE ".$table_group." SET   name = '".Database::escape_string($name)."', secret_directory = '".$unique_name."' 
+		$sql = "UPDATE ".$table_group." SET name = '".Database::escape_string($name)."', secret_directory = '".$unique_name."' 
 				WHERE c_id = $course_id AND id ='".$lastId."'";
 
 		Database::query($sql);
@@ -305,7 +305,9 @@ class GroupManager {
 		self :: delete_category(VIRTUAL_COURSE_CATEGORY);
 		$id = self :: create_category(get_lang('GroupsFromVirtualCourses'), '', TOOL_NOT_AVAILABLE, TOOL_NOT_AVAILABLE, 0, 0, 1, 1);
 		$table_group_cat = Database :: get_course_table(TABLE_GROUP_CATEGORY);
-		$sql = "UPDATE ".$table_group_cat." SET id=".VIRTUAL_COURSE_CATEGORY." WHERE id=$id";
+        $course_id = api_get_course_int_id();
+        
+		$sql = "UPDATE ".$table_group_cat." SET id=".VIRTUAL_COURSE_CATEGORY." WHERE c_id = $course_id AND id=$id";
 		Database::query($sql);
 		$course = api_get_course_info();
 		$course['code'] = $course['sysCode'];
@@ -314,14 +316,11 @@ class GroupManager {
 		$group_courses = $virtual_courses;
 		$group_courses[] = $course;
 		$ids = array ();
-		foreach ($group_courses as $index => $group_course)
-		{
+		foreach ($group_courses as $index => $group_course) {
 			$users = CourseManager :: get_user_list_from_course_code($group_course['code']);
 			$members = array ();
-			foreach ($users as $index => $user)
-			{
-				if ($user['status'] == 5 && $user['tutor_id'] == 0)
-				{
+			foreach ($users as $index => $user) {
+				if ($user['status'] == 5 && $user['tutor_id'] == 0) {
 					$members[] = $user['user_id'];
 				}
 			}
@@ -498,7 +497,7 @@ class GroupManager {
 					max_student=".Database::escape_string($maximum_number_of_students).",
 					self_registration_allowed='".Database::escape_string($self_registration_allowed)."',
 					self_unregistration_allowed='".Database::escape_string($self_unregistration_allowed)."'
-					WHERE id=".$group_id;
+					WHERE c_id = $course_id AND id=".$group_id;
 		$result = Database::query($sql);
 		//Here we are updating a field in the table forum_forum that perhaps duplicates the table group_info.forum_state cvargas
 		$forum_state = (int) $forum_state;
@@ -1135,7 +1134,7 @@ class GroupManager {
 		foreach ($user_ids as $index => $user_id) {			
 			$user_id = Database::escape_string($user_id);
 			$group_id = Database::escape_string($group_id);
-			echo $sql = "INSERT INTO ".$table_group_tutor." (c_id, user_id, group_id) VALUES ('$course_id', '".$user_id."', '".$group_id."')";
+			$sql = "INSERT INTO ".$table_group_tutor." (c_id, user_id, group_id) VALUES ('$course_id', '".$user_id."', '".$group_id."')";
 			$result &= Database::query($sql);
 		}
 		return $result;
diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index 4cdf84de76..d57e818beb 100644
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -667,7 +667,7 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
 			
 							$ends_query = ' SET ends_on = '."'".($there_is_a_end_date ? api_get_utc_datetime(get_date_from_group('ends')) : '0000-00-00 00:00:00')."'";
 							Database::query('UPDATE '.$work_assigment.$ends_query.' WHERE c_id = '.$course_id.' AND id = '."'".$row['has_properties']."'");
-							$sql_add_publication = "UPDATE ".$work_table." SET has_properties  = '".$row['has_properties'].  "', view_properties=1 WHERE c_id = '.$course_id.' AND id ='".$row['id']."'";
+							$sql_add_publication = "UPDATE ".$work_table." SET has_properties  = '".$row['has_properties'].  "', view_properties=1 WHERE c_id = $course_id AND id ='".$row['id']."'";
 							Database::query($sql_add_publication);
 				
                             $sql = 'UPDATE '.$work_table.' SET 
diff --git a/main/work/work.php b/main/work/work.php
index 83c4c48d82..d6aa73a7da 100644
--- a/main/work/work.php
+++ b/main/work/work.php
@@ -691,10 +691,11 @@ switch ($action) {
 	    								    expires_on       		= '".((isset($_POST['type1']) && $_POST['type1']==1) ? api_get_utc_datetime(get_date_from_select('expires')) : '0000-00-00 00:00:00'). "',
 	    							        ends_on        	 		= '".((isset($_POST['type2']) && $_POST['type2']==1) ? api_get_utc_datetime(get_date_from_select('ends')) : '0000-00-00 00:00:00')."',
 	    				                    add_to_calendar  		= '$agenda_id',
-	    				                    enable_qualification 	= '".$enable_calification."',
-	    				                    publication_id 			= '".$id."'";
+	    				                    enable_qualification 	= '$enable_calification',
+	    				                    publication_id 			= '$id'";
 					Database::query($sql_add_homework);	
-					$sql_add_publication = "UPDATE ".$work_table." SET "."has_properties  = ".Database::insert_id().", view_properties = 1 ".' where id = '.$id;
+                    $my_last_id = Database::insert_id();
+					$sql_add_publication = "UPDATE $work_table SET has_properties  = $my_last_id , view_properties = 1  WHERE c_id = $course_id AND id = $id";
 					Database::query($sql_add_publication);
 				} else {
 					$sql_add_homework = "INSERT INTO $TSTDPUBASG SET