Improve OSX config