Some changes for OS X