Fix NPM support