Fix issues stopping and restarting streams