Fix: expand_comp, rollup_comp