Fixes to nvar.