various packaging fixes