Final fixes, fix vcs check for packages with explicit naming.