Some little fixes
Merge remote-tracking branch 'upstream/nfn' into nfn