Update for NewServer API change.