some fixes for OC and UC