fixes to support osc