Switch to multi-mode streams for better buffering