A few minor changes regarding OSX support