(OSX) Some changes for OSX