Fix bugs with routing to individual streams.