Fixed some NPM issues