[OTFC] Some minor changes to Set