Minor updates to match changes in Nfs.