Fixups for skia patches