Fixes to nbv