Embarassingly missed to commit these fixes for the out-streams.