Minor modifications for adding to npm