Fixing issues with NSSet.