fixes to sdo, soho, stereo
merged upstream