Fixing cairo changes