Fix Images and StreamProxy