Fix packaging for all packs