Some NFS improvements