diff --git a/module/common/model.php b/module/common/model.php
index a80847c433..49ecffd29e 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -1312,19 +1312,19 @@ EOD;
         if($module == 'effort' and ($method == 'batchcreate' or $method == 'createforobject')) return true;
 
         // limited project
-        $limitedProject = false;
         if(!empty($module) && $module == 'task' && !empty($object->project) or
             !empty($module) && $module == 'project' && !empty($object->id))
         {
+            $limitedProject = false;
             $objectID = '';
             if(!empty($object->id)) $objectID = $object->id;
             if(!empty($object->id) && !empty($object->project)) $objectID = $object->project;
 
             $limitedProjects = !empty($_SESSION['limitedProjects']) ? $_SESSION['limitedProjects'] : '';
             if(strpos(",{$limitedProjects},", ",$objectID,") !== false) $limitedProject = true;
+            if(empty($app->user->rights['rights']['my']['limited']) && !$limitedProject) return true;
         }
 
-        if(empty($app->user->rights['rights']['my']['limited']) && !$limitedProject) return true;
 
         if(!is_null($method) && strpos($method, 'batch')  === 0) return false;
         if(!is_null($method) && strpos($method, 'link')   === 0) return false;
diff --git a/module/project/model.php b/module/project/model.php
index 9c2ced8389..acea00bd99 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2072,15 +2072,6 @@ class projectModel extends model
 
             $statusVar = 'status' . ucfirst($task->status);
             $$statusVar ++;
-
-            if(!empty($task->children))
-            {
-                $taskSum += count($task->children);
-                foreach($task->children as $child)
-                {
-                    if($child->status == 'wait') $statusWait ++;
-                }
-            }
             $taskSum ++;
         }
 
diff --git a/module/task/model.php b/module/task/model.php
index 104e736e9e..a210add22e 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2246,6 +2246,7 @@ class taskModel extends model
         $canBatchAssignTo     = common::hasPriv('task', 'batchAssignTo', !empty($task) ? $task : null);
 
         $canBatchAction = $canBatchEdit or $canBatchClose or $canBatchCancel or $canBatchChangeModule or $canBatchAssignTo;
+        $storyChanged   = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion);
 
         $canView  = common::hasPriv('task', 'view');
         $taskLink = helper::createLink('task', 'view', "taskID=$task->id");
@@ -2301,7 +2302,6 @@ class taskModel extends model
                     echo $this->lang->task->typeList[$task->type];
                     break;
                 case 'status':
-                    $storyChanged = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion);
                     $storyChanged ? print("<span class='status-changed'><span class='label label-dot'></span> {$this->lang->story->changed}</span>") : print("<span class='status-{$task->status}'><span class='label label-dot'></span> {$this->lang->task->statusList[$task->status]}</span>");
                     break;
                 case 'estimate':
@@ -2397,9 +2397,8 @@ class taskModel extends model
                     echo substr($task->lastEditedDate, 5, 11);
                     break;
                 case 'actions':
-                    if($task->storyStatus == 'changed' or $browseType == 'needconfirm')
+                    if($storyChanged)
                     {
-                        $this->lang->task->confirmStoryChange = $this->lang->confirm;
                         common::printIcon('task', 'confirmStoryChange', "taskid=$task->id", '', 'list', '', 'hiddenwin', 'btn-wide');
                         break;
                     }