Validation fixes, added option to set nv/dv directly