Fixes to npm package management