diff --git a/module/common/model.php b/module/common/model.php
index d5362d367d..235ed57df4 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -2078,7 +2078,7 @@ EOF;
         $changes = array();
         foreach($new as $key => $value)
         {
-            if(is_object($value) or is_array($value)) continue;
+            if(is_object($value) || is_array($value) || is_null($value)) continue;
             if(strtolower($key) == 'lastediteddate')  continue;
             if(strtolower($key) == 'lasteditedby')    continue;
             if(strtolower($key) == 'assigneddate')    continue;
diff --git a/module/task/control.php b/module/task/control.php
index 35f51e65c2..4c8bfbae74 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -669,7 +669,7 @@ class task extends control
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
             /* Record task effort. */
-            $effort = $this->buildEffortForStart($task, $taskData);
+            $effort = $this->taskZen->buildEffortForStart($task, $taskData);
             if($this->post->comment) $effort->work = $this->post->comment;
             if($effort->consumed > 0) $effortID = $this->task->addTaskEffort($effort);
             if($task->mode == 'linear' && !empty($effortID)) $this->task->updateEstimateOrder($effortID, $currentTeam->order);
diff --git a/module/task/zen.php b/module/task/zen.php
index 46d0c0a0ba..e77dfd2b0d 100644
--- a/module/task/zen.php
+++ b/module/task/zen.php
@@ -1464,7 +1464,7 @@ class taskZen extends task
     protected function responseAfterChangeStatus(object $task, string $from): array
     {
         if($this->viewType == 'json' || (defined('RUN_MODE') && RUN_MODE == 'api')) return array('result' => 'success');
-        if(isonlybody()) return $this->responseModal($task, $from);
+        if(helper::isAjaxRequest('modal')) return $this->responseModal($task, $from);
         return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $this->createLink('task', 'view', "taskID={$task->id}"));
     }