Fix consistency issues with server-root.