Content server tweaks