Nvp fixes

Fixes both DHC-1084 and DHC-1152