Some loose ends
Merge branch 'master' of https://github.com/loghyr/NFSv4.2