Some changes for OSX