More NRV changes