small bug fixes & improvements around terminating streaming