These changes are required to work on ubuntu - but not compatible with osx. I need to make it select the right config based on the environment.