Better non-resolvable modules handling.