more OSC fixes