Fix resolution of optional and path based dependencies.