Update for changes in Cairo