Fixes for NPM integration