some packaging fixes