OSC cleanup and fixes