ops: more component fixing