Small fix
Output streaming improvements