Some changes for working on OS X