Rework of the plugins to get the streams right.