Modifications to OSC support after discussions with Robert Nagy