Some more tweaks to proxied headers