Resolver fixes