Upgrade to latest cairo compatibility