NPM and bug fixes