packaging fixes