Fix builds on latest OS X