More NameSync ID related fixes