Maybe fixed NPM issues