Osc fixes + test example