sc: more stream tweaks

Change-Id: I452ba76cec425e397369e0fcc689ba639d5325b0