Fix random group expansion failures

 * Add missing wait group
 * Remove catalog package dependency from library groups