Bug fixes all over, mostly OSC & Server