diff --git a/app/DataMapper/Tax/BaseRule.php b/app/DataMapper/Tax/BaseRule.php
index 4ec33ab9656d..061fc0c478ed 100644
--- a/app/DataMapper/Tax/BaseRule.php
+++ b/app/DataMapper/Tax/BaseRule.php
@@ -11,11 +11,12 @@
 
 namespace App\DataMapper\Tax;
 
-use App\DataMapper\Tax\ZipTax\Response;
-use App\DataProviders\USStates;
+use App\Models\Quote;
 use App\Models\Client;
 use App\Models\Invoice;
 use App\Models\Product;
+use App\DataProviders\USStates;
+use App\DataMapper\Tax\ZipTax\Response;
 
 class BaseRule implements RuleInterface
 {
@@ -210,7 +211,7 @@ class BaseRule implements RuleInterface
         }
 
         /** Applies the tax data to the invoice */
-        if($this->invoice instanceof Invoice && $tax_data) {
+        if(($this->invoice instanceof Invoice || $this->invoice instanceof Quote) && $tax_data) {
 
             $this->invoice->tax_data = $tax_data;
 
diff --git a/app/Import/Transformer/Csv/TaskTransformer.php b/app/Import/Transformer/Csv/TaskTransformer.php
index d2c6d4538f33..810169db6cd7 100644
--- a/app/Import/Transformer/Csv/TaskTransformer.php
+++ b/app/Import/Transformer/Csv/TaskTransformer.php
@@ -49,7 +49,7 @@ class TaskTransformer extends BaseTransformer
             'client_id' => $clientId,
             'project_id' => $this->getProjectId($projectId, $clientId),
             'description' => $this->getString($task_data, 'task.description'),
-            'status' => $this->getTaskStatusId($task_data),
+            'status_id' => $this->getTaskStatusId($task_data),
             'custom_value1' => $this->getString($task_data, 'task.custom_value1'),
             'custom_value2' => $this->getString($task_data, 'task.custom_value2'),
             'custom_value3' => $this->getString($task_data, 'task.custom_value3'),