Resolve package cycle issues