Fixes for npm install