Packaging fixes.
