Fixing how streams are started/ended.