[Resolver] Fixed all regressions