fix osc type coercion, cleanup