Patch Winston (update for Cairo deprecations, NaN breaks)