Changes now that nvm is removed