Updates to support global npm install