Peers fixes
Resolver shutdown