Fixes for handling server settings with a single server.