Making changes to the setup environment compatible for Mac OSX and Linux