diff --git a/src/Darkbluesun/GoldfishBundle/Entity/Task.php b/src/Darkbluesun/GoldfishBundle/Entity/Task.php
@@ -313,6 +313,7 @@ public function getWorkspace()
     public function setClient(Client $client = null)
     {
         $this->client = $client;
+        $this->project = null;
 
         return $this;
     }
@@ -336,6 +337,7 @@ public function getClient()
     public function setProject(Project $project = null)
     {
         $this->project = $project;
+        $this->client = null;
 
         return $this;
     }
@@ -374,30 +376,38 @@ public function getAssignee()
     }
 
     /**
-     * Add comments
+     * Add comment.
+     *
+     * @param TaskComment $comment
      *
-     * @param TaskComment $comments
      * @return Task
      */
-    public function addComment(TaskComment $comments)
+    public function addComment(TaskComment $comment)
     {
-        $this->comments[] = $comments;
+        if (!$this->comments->contains($comment)) {
+            $this->comments->add($comment);
+            $comment->setTask($this);
+        }
 
         return $this;
     }
 
     /**
-     * Remove comments
+     * Remove comment.
+     *
+     * @param TaskComment $comment
      *
-     * @param TaskComment $comments
+     * @return Task
      */
-    public function removeComment(TaskComment $comments)
+    public function removeComment(TaskComment $comment)
     {
-        $this->comments->removeElement($comments);
+        $this->comments->removeElement($comment);
+
+        return $this;
     }
 
     /**
-     * Get comments
+     * Get comments.
      *
      * @return \Doctrine\Common\Collections\Collection 
      */
@@ -407,30 +417,37 @@ public function getComments()
     }
 
     /**
-     * Add timeEntries
+     * Add timeEntry.
      *
-     * @param TimeEntry $timeEntries
+     * @param TimeEntry $timeEntry
      * @return Task
      */
-    public function addTimeEntry(TimeEntry $timeEntries)
+    public function addTimeEntry(TimeEntry $timeEntry)
     {
-        $this->timeEntries[] = $timeEntries;
+        if (!$this->timeEntries->contains($timeEntry)) {
+            $this->timeEntries->add($timeEntry);
+            $timeEntry->setTask($this);
+        }
 
         return $this;
     }
 
     /**
-     * Remove timeEntries
+     * Remove timeEntry.
+     *
+     * @param TimeEntry $timeEntry
      *
-     * @param TimeEntry $timeEntries
+     * @return Task
      */
-    public function removeTimeEntry(TimeEntry $timeEntries)
+    public function removeTimeEntry(TimeEntry $timeEntry)
     {
-        $this->timeEntries->removeElement($timeEntries);
+        $this->timeEntries->removeElement($timeEntry);
+
+        return $this;
     }
 
     /**
-     * Get timeEntries
+     * Get timeEntries.
      *
      * @return \Doctrine\Common\Collections\Collection 
      */

diff --git a/src/Darkbluesun/GoldfishBundle/Entity/TimeEntry.php b/src/Darkbluesun/GoldfishBundle/Entity/TimeEntry.php
@@ -192,6 +192,7 @@ public function getUser()
     public function setTask(Task $task = null)
     {
         $this->task = $task;
+        $this->client = $this->project = null;
 
         return $this;
     }
@@ -210,19 +211,21 @@ public function getTask()
      * Set project
      *
      * @param Project $project
+     *
      * @return TimeEntry
      */
     public function setProject(Project $project = null)
     {
         $this->project = $project;
+        $this->client = $this->task = null;
 
         return $this;
     }
 
     /**
      * Get project
      *
-     * @return Project 
+     * @return Project
      */
     public function getProject()
     {
@@ -233,11 +236,13 @@ public function getProject()
      * Set client
      *
      * @param Client $client
+     *
      * @return TimeEntry
      */
     public function setClient(Client $client = null)
     {
         $this->client = $client;
+        $this->project = $this->task = null;
 
         return $this;
     }