Updates to fix NPM warnings