Fix some edge cases with stream toggling..