Misc minor NVAF stuff.