[Resolver] Fixed most regressions.