diff --git a/app/Importer/AccessoryImporter.php b/app/Importer/AccessoryImporter.php
index 30b7be5e22..285c6f954d 100644
--- a/app/Importer/AccessoryImporter.php
+++ b/app/Importer/AccessoryImporter.php
@@ -41,6 +41,7 @@ class AccessoryImporter extends ItemImporter
         $this->log("No Matching Accessory, Creating a new one");
         $accessory = new Accessory();
         $accessory->fill($this->sanitizeItemForStoring($accessory));
+        $accessory->unsetEventDispatcher();
         if ($accessory->save()) {
             $accessory->logCreate('Imported using CSV Importer');
             $this->log('Accessory ' . $this->item["name"] . ' was created');
diff --git a/app/Importer/AssetImporter.php b/app/Importer/AssetImporter.php
index 02e4505a1b..d863aaec6e 100644
--- a/app/Importer/AssetImporter.php
+++ b/app/Importer/AssetImporter.php
@@ -106,6 +106,7 @@ class AssetImporter extends ItemImporter
                 $asset->{$custom_field} = $val;
             }
         }
+        $asset->unsetEventDispatcher();
         if ($asset->save()) {
             $asset->logCreate('Imported using csv importer');
             $this->log('Asset ' . $this->item["name"] . ' with serial number ' . $this->item['serial'] . ' was created');
diff --git a/app/Importer/ComponentImporter.php b/app/Importer/ComponentImporter.php
index 3f067b8388..eca9104629 100644
--- a/app/Importer/ComponentImporter.php
+++ b/app/Importer/ComponentImporter.php
@@ -27,29 +27,26 @@ class ComponentImporter extends ItemImporter
     public function createComponentIfNotExists()
     {
         $component = null;
-        $editingComponent = false;
         $this->log("Creating Component");
         $component = Component::where('name', $this->item['name'])
                         ->where('serial', $this->item['serial'])
                         ->first();
 
         if ($component) {
-            $editingComponent = true;
             $this->log('A matching Component ' . $this->item["name"] . ' with serial ' .$this->item['serial'].' already exists.  ');
             if (!$this->updating) {
                 $this->log("Skipping Component");
                 return;
             }
             $this->log("Updating Component");
-            $component = $this->components[$componentId];
-            $component->update($this->sanitizeItemFor($component));
+            $component->update($this->sanitizeItemForUpdating($component));
             $component->save();
             return;
         }
         $this->log("No matching component, creating one");
         $component = new Component;
-        $component->fill($$this->sanitizeItemForStoring($component));
-
+        $component->fill($this->sanitizeItemForStoring($component));
+        $component->unsetEventDispatcher();
         if ($component->save()) {
             $component->logCreate('Imported using CSV Importer');
             $this->log("Component " . $this->item["name"] . ' was created');
diff --git a/app/Importer/ConsumableImporter.php b/app/Importer/ConsumableImporter.php
index 07d3b28b28..43bdfe693b 100644
--- a/app/Importer/ConsumableImporter.php
+++ b/app/Importer/ConsumableImporter.php
@@ -41,6 +41,7 @@ class ConsumableImporter extends ItemImporter
         $consumable = new Consumable();
         $consumable->fill($this->sanitizeItemForStoring($consumable));
 
+        $consumable->unsetEventDispatcher();
         if ($consumable->save()) {
             $consumable->logCreate('Imported using CSV Importer');
             $this->log("Consumable " . $this->item["name"] . ' was created');
diff --git a/app/Importer/LicenseImporter.php b/app/Importer/LicenseImporter.php
index 8d1a0ac8f2..97c15768a8 100644
--- a/app/Importer/LicenseImporter.php
+++ b/app/Importer/LicenseImporter.php
@@ -63,6 +63,8 @@ class LicenseImporter extends ItemImporter
         } else {
             $license->fill($this->sanitizeItemForStoring($license));
         }
+
+        $license->unsetEventDispatcher();
         if ($license->save()) {
             $license->logCreate('Imported using csv importer');
             $this->log('License ' . $this->item["name"] . ' with serial number ' . $this->item['serial'] . ' was created');
diff --git a/app/Models/Loggable.php b/app/Models/Loggable.php
index 5e13bb8a87..3674b21788 100644
--- a/app/Models/Loggable.php
+++ b/app/Models/Loggable.php
@@ -182,7 +182,7 @@ trait Loggable
         $log->location_id = null;
         $log->note = $note;
         $log->user_id = $user_id;
-        $log->logaction('created');
+        $log->logaction('create');
         $log->save();
         return $log;
     }