More NVM fixes