Changes to match updates in NFS.