diff --git a/src/CoreBundle/Entity/Resource/ResourceComment.php b/src/CoreBundle/Entity/Resource/ResourceComment.php
index 61ef813032..051fcb0a34 100644
--- a/src/CoreBundle/Entity/Resource/ResourceComment.php
+++ b/src/CoreBundle/Entity/Resource/ResourceComment.php
@@ -42,7 +42,7 @@ class ResourceComment
      * @var User
      *
      * @Groups({"list"})
-     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User", inversedBy="resourceComments")
+     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User")
      * @ORM\JoinColumn(name="author_id", referencedColumnName="id", onDelete="SET NULL")
      */
     protected $author;
diff --git a/src/CoreBundle/Entity/Resource/ResourceLink.php b/src/CoreBundle/Entity/Resource/ResourceLink.php
index a07089b8a3..00732382bd 100644
--- a/src/CoreBundle/Entity/Resource/ResourceLink.php
+++ b/src/CoreBundle/Entity/Resource/ResourceLink.php
@@ -345,11 +345,10 @@ class ResourceLink
     }
 
     /**
-     * @return $this
      */
     public function getResource()
     {
-        return $this;
+//        return $this;
     }
 
     public static function getVisibilityList(): array
diff --git a/src/CoreBundle/Entity/Resource/ResourceTag.php b/src/CoreBundle/Entity/Resource/ResourceTag.php
index 3d5b10dff1..4e32133379 100644
--- a/src/CoreBundle/Entity/Resource/ResourceTag.php
+++ b/src/CoreBundle/Entity/Resource/ResourceTag.php
@@ -30,7 +30,7 @@ class ResourceTag
     protected $name;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User", inversedBy="resourceComments")
+     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User")
      * @ORM\JoinColumn(name="author_id", referencedColumnName="id", onDelete="SET NULL")
      */
     protected $author;
diff --git a/src/CoreBundle/Entity/Resource/ResourceUserTag.php b/src/CoreBundle/Entity/Resource/ResourceUserTag.php
index d6cab125e3..df7f964354 100644
--- a/src/CoreBundle/Entity/Resource/ResourceUserTag.php
+++ b/src/CoreBundle/Entity/Resource/ResourceUserTag.php
@@ -23,7 +23,7 @@ class ResourceUserTag
     protected $id;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User", inversedBy="resourceTags")
+     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User")
      * @ORM\JoinColumn(name="user_id", referencedColumnName="id", onDelete="SET NULL")
      */
     protected $user;
diff --git a/src/CoreBundle/Entity/Usergroup.php b/src/CoreBundle/Entity/Usergroup.php
index b2d3099349..6f94712ee5 100644
--- a/src/CoreBundle/Entity/Usergroup.php
+++ b/src/CoreBundle/Entity/Usergroup.php
@@ -9,7 +9,6 @@ use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Timestampable\Traits\TimestampableEntity;
 
 /**
- * Usergroup.
  *
  * @ORM\Table(name="usergroup")
  * @ORM\Entity
diff --git a/src/CoreBundle/Entity/UsergroupRelCourse.php b/src/CoreBundle/Entity/UsergroupRelCourse.php
index 782e875e0d..4360d09a34 100644
--- a/src/CoreBundle/Entity/UsergroupRelCourse.php
+++ b/src/CoreBundle/Entity/UsergroupRelCourse.php
@@ -7,8 +7,6 @@ namespace Chamilo\CoreBundle\Entity;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * UsergroupRelCourse.
- *
  * @ORM\Table(name="usergroup_rel_course")
  * @ORM\Entity
  */
diff --git a/src/CourseBundle/Entity/CShortcut.php b/src/CourseBundle/Entity/CShortcut.php
index c64f5f17c7..91858b3edb 100644
--- a/src/CourseBundle/Entity/CShortcut.php
+++ b/src/CourseBundle/Entity/CShortcut.php
@@ -35,7 +35,7 @@ class CShortcut extends AbstractResource implements ResourceInterface
 
     /**
      * @ORM\OneToOne(
-     *     targetEntity="Chamilo\CoreBundle\Entity\Resource\ResourceNode", mappedBy="resource"
+     *     targetEntity="Chamilo\CoreBundle\Entity\Resource\ResourceNode"
      * )
      * @ORM\JoinColumn(name="shortcut_node_id", referencedColumnName="id")
      */
diff --git a/src/CourseBundle/Entity/CThematicPlan.php b/src/CourseBundle/Entity/CThematicPlan.php
index 048f20f27c..0fdc9d3b2f 100644
--- a/src/CourseBundle/Entity/CThematicPlan.php
+++ b/src/CourseBundle/Entity/CThematicPlan.php
@@ -48,7 +48,7 @@ class CThematicPlan extends AbstractResource implements ResourceInterface
     /**
      * @var CThematic
      *
-     * @ORM\ManyToOne(targetEntity="Chamilo\CourseBundle\Entity\CThematic")
+     * @ORM\ManyToOne(targetEntity="Chamilo\CourseBundle\Entity\CThematic", inversedBy="plans")
      * @ORM\JoinColumn(name="thematic_id", referencedColumnName="iid")
      */
     protected $thematic;