Packaging fixes