The second patch is now live. It should fix the remaining issues, but feel free to let me know if you run into anything else.
Can't find any problems so far
