Assorted small packaging fixes