StreamProxy improvements