FIX: Repair component dependencies