fixes for fd_server exit