Resolved issues with vendor packages