diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index dbf98f3324058f61e091200426aa4c01d8580c24..bb71cb6a73754b1b900ecb7f710b27ada15aae29 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -7596,7 +7596,7 @@
             <description></description>
             <auditSyncConfig>
               <name>auditSyncConfig</name>
-              <auditMode v="2" />
+              <auditMode v="0" />
               <syncActive v="false" />
               <syncComplete v="true" />
               <syncDirection v="1" />
diff --git a/entity/Person_entity/recordcontainers/db/onDBInsert.js b/entity/Person_entity/recordcontainers/db/onDBInsert.js
index 0a1ea849e4507f7e1f552c10898f642d1a7155c4..29d0967acda39ed176e5b032dbd4569c3db85f16 100644
--- a/entity/Person_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Person_entity/recordcontainers/db/onDBInsert.js
@@ -39,10 +39,9 @@ for (fieldname in entityModel.fields)
 
 let scanResults = DuplicateScannerUtils.ScanForDuplicates("PersonDuplicates", targetEntity,
 valuesToCheck, null);
-logging.log("scanResults.length -> " + scanResults.length);
 
 //If we found duplicates, cache them
-if(scanResults.length > 0)
+if(scanResults != null && scanResults.length > 0)
 {
     let insertCount = DuplicateScannerUtils.CacheNewScanResults(contactId, scanResults, targetEntity);
     logging.log("insertCount -> " + insertCount);
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index 02ac88adb4f0e6876cb2d84d9f53d9955eb9de68..10e41fa1b40682c7da3bba9016ba05ba503a6df6 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -743,8 +743,6 @@ DuplicateScannerUtils.MergePerson = function(pSourceContactId, pTargetContactId)
 
     DuplicateScannerUtils.DeleteCachedDuplicate(pSourceContactId);
 
-    _DuplicateScannerUtils._ensureDataValidityAfterMergePerson(pTargetContactId);
-    
     return (affectedRowsCurrentAlias > 0 && deletedRows >= 2);
 }
 
@@ -775,7 +773,7 @@ DuplicateScannerUtils.MergeOrganisation = function(pSourceContactId, pTargetCont
     //logging.log("deleteStatements -> " + JSON.stringify(deleteStatements));
 
     let affectedRowsCurrentAlias = db.updates(updateStatementsCurrentAlias);
-    let affectedRowsSystemAlias = db.updates(updateStatementsSystemAlias, "_____SYSTEMALIAS");
+    let affectedRowsSystemAlias = db.updates(updateStatementsSystemAlias, SqlUtils.getSystemAlias());
     let deletedRows = db.deletes(deleteStatements)
 
     //logging.log("affectedRowsCurrentAlias -> " + affectedRowsCurrentAlias);