Retain byte streams to make proxy implementation cleaner
Fix HTTP stream handling and remove BOM hack fix