Fix some bugs in loading comps.