Final packaging fixes