Fix dependency paths resolution