diff --git a/source/Plugins/AyaNova.Plugin.V8/V8.cs b/source/Plugins/AyaNova.Plugin.V8/V8.cs
index c990de0..137b6d6 100644
--- a/source/Plugins/AyaNova.Plugin.V8/V8.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/V8.cs
@@ -1029,9 +1029,9 @@ namespace AyaNova.PlugIn.V8
                         d.notes = cn.Notes;
                         TagFromv7Guid(cn.ClientNoteTypeID, tags);
                         SetTags(d, tags);
-                        await util.PostAsync("customer-note", d.ToString());
-                         //Event log fixup
-                await util.EventLog(util.AyaType.ClientNote, RavenId, SafeGetUserMap(c.Creator), SafeGetUserMap(c.Modifier), c.Created, c.Modified);
+                        var newId = util.IdFromResponse(await util.PostAsync("customer-note", d.ToString()));
+                        //Event log fixup
+                        await util.EventLog(util.AyaType.CustomerNote, newId, SafeGetUserMap(cn.Creator), SafeGetUserMap(cn.Modifier), cn.Created, cn.Modified);
 
 
 
@@ -1704,9 +1704,9 @@ namespace AyaNova.PlugIn.V8
                 Unit c = Unit.GetItem(i.ID);
                 if (c.ParentID == Guid.Empty && c.ReplacedByUnitID == Guid.Empty) continue;
                 var ObjectTID = new TypeAndID(RootObjectTypes.Unit, c.ID);
-                long ThisUnitRavenId= Getv7v8IdMap(c.ID, "Unit for parent / replaced by unit step 2 unit import");
+                long ThisUnitRavenId = Getv7v8IdMap(c.ID, "Unit for parent / replaced by unit step 2 unit import");
                 var a = await util.GetAsync("unit/" + ThisUnitRavenId.ToString());
-                dynamic d = a.ObjectResponse["data"];                
+                dynamic d = a.ObjectResponse["data"];
 
                 progress.Op(ObjectTypeName + " " + d.serial);
                 d.replacedByUnitId = Getv7v8IdMapNullOk(c.ReplacedByUnitID);