Changes to get environment to run on MAC