Partial fix for stream formatting issues.