nvm fixes