Fix deprecation warnings from Cairo cleanup