Some fixes to the duplicates-finder