Fixes/cleanups for package building