Fix warnings in NRV