Resolver shutdown fixes