Merge pull request #388 from koenpunt/small-fixes

Use NVM_ prefix for non local variables