Merge "Correct some dependencies around zip packages"