StreamProxy tweaks