More fixes for in-tree cairo