Fixes related to 'default_server' option