Fix bugs
Fix stream toggle bugs