Flow fixes between clips and streams