Fixes to stream, server, sources