Packaging fixes from boilerplate