[OTFC] minor fixes