OSX related adjustments