Fixes for NPM