diff --git a/app/Jobs/Cron/UpdateCalculatedFields.php b/app/Jobs/Cron/UpdateCalculatedFields.php
index e60b8483bb5b..98371260b07f 100644
--- a/app/Jobs/Cron/UpdateCalculatedFields.php
+++ b/app/Jobs/Cron/UpdateCalculatedFields.php
@@ -61,7 +61,7 @@ class UpdateCalculatedFields
                 MultiDB::setDB($db);
 
 
-            Project::with('tasks')->whereHas('tasks', function ($query){
+            Project::query()->with('tasks')->whereHas('tasks', function ($query){
                     $query->where('updated_at', '>', now()->subHours(2));
             })
                 ->cursor()
diff --git a/app/Models/Project.php b/app/Models/Project.php
index d25bd23630c6..c2d09f250a11 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -83,28 +83,22 @@ class Project extends BaseModel
 
     protected $touches = [];
 
-    /**
-     * @return BelongsTo
-     */
-    public function company()
+    public function company(): \Illuminate\Database\Eloquent\Relations\BelongsTo
     {
         return $this->belongsTo(Company::class);
     }
 
-    /**
-     * @return mixed
-     */
-    public function client()
+    public function client(): \Illuminate\Database\Eloquent\Relations\BelongsTo
     {
         return $this->belongsTo(Client::class)->withTrashed();
     }
 
-    public function vendor()
+    public function vendor(): \Illuminate\Database\Eloquent\Relations\BelongsTo
     {
         return $this->belongsTo(Vendor::class)->withTrashed();
     }
 
-    public function project()
+    public function project(): \Illuminate\Database\Eloquent\Relations\BelongsTo
     {
         return $this->belongsTo(self::class)->withTrashed();
     }
@@ -114,12 +108,12 @@ class Project extends BaseModel
         return $this->morphMany(Document::class, 'documentable');
     }
 
-    public function user()
+    public function user(): \Illuminate\Database\Eloquent\Relations\BelongsTo
     {
         return $this->belongsTo(User::class)->withTrashed();
     }
 
-    public function tasks()
+    public function tasks(): \Illuminate\Database\Eloquent\Relations\HasMany
     {
         return $this->hasMany(Task::class);
     }
diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php
index a0a1610c6d3f..51fcb2dc1a95 100644
--- a/app/Utils/TemplateEngine.php
+++ b/app/Utils/TemplateEngine.php
@@ -302,6 +302,8 @@ class TemplateEngine
             'company_id' => $user->company()->id,
         ]);
 
+        
+        /** @var \App\Models\ClientContact $contact */
         $contact = ClientContact::factory()->create([
             'user_id' => $user->id,
             'company_id' => $user->company()->id,