More changes to build a package.