Nvm fixes