Server/client config fixes.