Further changes trying to avoid use of nvm on OS/X