Updated for newer versions of packages.