unify comp unit fixups nearly done