Ticket0667: Make syncChanges and syncDelete more robust