Changes to get Cairo building on OSX again