Fixing NPM issues