My changes to make it compile on Mavericks.