Some improvements for streaming.