Bug fixes from Add and Remove packs feature