fixes to ResolverSet