Some updates to server configuration