Fix setup of NVM