Several fixes to resolvers