Fixed some bugs with add_server_def.