Updates in line with nfs changes.