Fixes for npm