diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 84a0608a9b47..c21cc51fce35 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -929,7 +929,7 @@ class BaseController extends Controller
      *
      * @param  Builder $query
      */
-    protected function listResponse($query)
+    protected function listResponse(Builder $query)
     {
         $this->buildManager();
 
diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php
index 45d3aaec0f66..322f85fe51ae 100644
--- a/app/Http/Controllers/PreviewController.php
+++ b/app/Http/Controllers/PreviewController.php
@@ -128,9 +128,12 @@ class PreviewController extends BaseController
                 return (new Phantom)->convertHtmlToPdf($maker->getCompiledHTML(true));
             }
 
-            /** @var \App\Models\Company $company */
+
             /** @var App\Models\User auth()->user() */
-            $company = auth()->user()->company();
+            $user = auth()->user();
+
+            /** @var \App\Models\Company $company */
+            $company = $user->company();
 
             if (config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja') {
 
diff --git a/app/Models/Traits/Excludable.php b/app/Models/Traits/Excludable.php
index d5d4c73f61dc..c6d14b14abc5 100644
--- a/app/Models/Traits/Excludable.php
+++ b/app/Models/Traits/Excludable.php
@@ -28,10 +28,11 @@ trait Excludable
      * @param Builder $query
      * @param array $columns
      *
-     * @return mixed
+     * @return Builder
      */
     public function scopeExclude($query, $columns): \Illuminate\Database\Eloquent\Builder
     {
+        /** @var Builder $query */
         return $query->select(array_diff($this->getTableColumns(), (array) $columns));
     }
 }