Improvements in package build.