[Resolver] Molinillo fixes