Fixed NPM issues