Changes to make the compile easier on OS X 10.9.