Various fixes to SSC editor