diff --git a/app/Factory/ProductFactory.php b/app/Factory/ProductFactory.php
index 08e5c5a2b9f6..2b6622df2125 100644
--- a/app/Factory/ProductFactory.php
+++ b/app/Factory/ProductFactory.php
@@ -34,7 +34,7 @@ class ProductFactory
         $product->custom_value2 = '';
         $product->custom_value3 = '';
         $product->custom_value4 = '';
-        $product->is_deleted = 0;
+        $product->is_deleted = false;
         $product->tax_id = 1;
         
         return $product;
diff --git a/app/Factory/ProjectFactory.php b/app/Factory/ProjectFactory.php
index 0549b1104094..8e964457ef6d 100644
--- a/app/Factory/ProjectFactory.php
+++ b/app/Factory/ProjectFactory.php
@@ -20,7 +20,6 @@ class ProjectFactory
         $project = new Project;
         $project->company_id = $company_id;
         $project->user_id = $user_id;
-
         $project->public_notes = '';
         $project->private_notes = '';
         $project->budgeted_hours = 0;
@@ -30,7 +29,7 @@ class ProjectFactory
         $project->custom_value2 = '';
         $project->custom_value3 = '';
         $project->custom_value4 = '';
-        $project->is_deleted = 0;
+        $project->is_deleted = false;
 
         return $project;
     }
diff --git a/app/Models/Design.php b/app/Models/Design.php
index fbb6915135c4..c93453ed9e48 100644
--- a/app/Models/Design.php
+++ b/app/Models/Design.php
@@ -20,10 +20,11 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property int|null $user_id
  * @property int|null $company_id
  * @property string $name
- * @property int $is_custom
- * @property int $is_active
+ * @property bool $is_custom
+ * @property bool $is_active
  * @property object|null $design
- * @property int $is_deleted
+ * @property bool $is_deleted
+ * @property bool $is_template
  * @property int|null $created_at
  * @property int|null $updated_at
  * @property int|null $deleted_at
diff --git a/app/Models/Expense.php b/app/Models/Expense.php
index 875fa14172bb..314e3961eb66 100644
--- a/app/Models/Expense.php
+++ b/app/Models/Expense.php
@@ -33,22 +33,22 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property int|null $payment_type_id
  * @property int|null $recurring_expense_id
  * @property bool $is_deleted
- * @property string $amount
- * @property string $foreign_amount
+ * @property float $amount
+ * @property float $foreign_amount
  * @property string $exchange_rate
  * @property string|null $tax_name1
- * @property string $tax_rate1
+ * @property float $tax_rate1
  * @property string|null $tax_name2
- * @property string $tax_rate2
+ * @property float $tax_rate2
  * @property string|null $tax_name3
- * @property string $tax_rate3
+ * @property float $tax_rate3
  * @property string|null $date
  * @property string|null $payment_date
  * @property string|null $private_notes
  * @property string|null $public_notes
  * @property string|null $transaction_reference
- * @property int $should_be_invoiced
- * @property int $invoice_documents
+ * @property bool $should_be_invoiced
+ * @property bool $invoice_documents
  * @property int|null $transaction_id
  * @property string|null $custom_value1
  * @property string|null $custom_value2
@@ -56,9 +56,9 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property string|null $custom_value4
  * @property string|null $number
  * @property int|null $project_id
- * @property string $tax_amount1
- * @property string $tax_amount2
- * @property string $tax_amount3
+ * @property float $tax_amount1
+ * @property float $tax_amount2
+ * @property float $tax_amount3
  * @property int $uses_inclusive_taxes
  * @property int $calculate_tax_by_amount
  * @property-read \App\Models\User|null $assigned_user
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 6ad30e5c7c30..22e9093f2d18 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -54,7 +54,7 @@ use Illuminate\Database\Eloquent\Relations\HasManyThrough;
  * @property string|null $last_sent_date
  * @property string|null $due_date
  * @property bool $is_deleted
- * @property object|array $line_items
+ * @property object|array|string $line_items
  * @property object|null $backup
  * @property string|null $footer
  * @property string|null $public_notes
diff --git a/app/Models/InvoiceInvitation.php b/app/Models/InvoiceInvitation.php
index 08513619b003..f8fb383db5dd 100644
--- a/app/Models/InvoiceInvitation.php
+++ b/app/Models/InvoiceInvitation.php
@@ -27,8 +27,8 @@ use Illuminate\Support\Facades\Storage;
  * @property int $id
  * @property int $company_id
  * @property int $user_id
- * @property int $client_contact_id
- * @property int $invoice_id
+ * @property int|null $client_contact_id
+ * @property int|null $invoice_id
  * @property string $key
  * @property string|null $transaction_reference
  * @property string|null $message_id
diff --git a/app/Models/Product.php b/app/Models/Product.php
index d07445e7f1b5..e4736a0f7ca7 100644
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -30,21 +30,21 @@ use League\CommonMark\CommonMarkConverter;
  * @property string|null $custom_value4
  * @property string|null $product_key
  * @property string|null $notes
- * @property string $cost
- * @property string $price
- * @property string $quantity
+ * @property float $cost
+ * @property float $price
+ * @property float $quantity
  * @property string|null $tax_name1
- * @property string $tax_rate1
+ * @property float $tax_rate1
  * @property string|null $tax_name2
- * @property string $tax_rate2
+ * @property float $tax_rate2
  * @property string|null $tax_name3
- * @property string $tax_rate3
+ * @property float $tax_rate3
  * @property int|null $deleted_at
  * @property int|null $created_at
  * @property int|null $updated_at
- * @property int $is_deleted
- * @property int $in_stock_quantity
- * @property int $stock_notification
+ * @property bool $is_deleted
+ * @property float $in_stock_quantity
+ * @property bool $stock_notification
  * @property int $stock_notification_threshold
  * @property int|null $max_quantity
  * @property string|null $product_image
diff --git a/app/Models/Project.php b/app/Models/Project.php
index c2d09f250a11..a256b3e74fac 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -15,10 +15,10 @@ use Laracasts\Presenter\PresentableTrait;
  * @property int $company_id
  * @property int|null $client_id
  * @property string $name
- * @property string $task_rate
+ * @property float $task_rate
  * @property string|null $due_date
  * @property string|null $private_notes
- * @property string $budgeted_hours
+ * @property float $budgeted_hours
  * @property string|null $custom_value1
  * @property string|null $custom_value2
  * @property string|null $custom_value3
@@ -27,7 +27,7 @@ use Laracasts\Presenter\PresentableTrait;
  * @property int|null $updated_at
  * @property int|null $deleted_at
  * @property string|null $public_notes
- * @property int $is_deleted
+ * @property bool $is_deleted
  * @property string|null $number
  * @property string $color
  * @property-read \App\Models\Client|null $client