Packages upgrades, paths fixes