Stream fixes

A few tiny changes