Bug fixes for npm
Bug fixes for npm