Fixing up npm versioning issues
Fixing up race conditions