Fixes for npmjs