Fixed Streams/related and Streams/preview tools