Robustify streaming start/stop ++