Fixes for proxied content