Changes to adapt to our server configuration.