Some more fixes for NFS mode