fix support for OC and enable ti