Small fixes motivated and related to the NFS hang bz