More bug fixes.
Thanks for looking into it, I haven't found a way to reliable replicate it. Seems almost random at the moment. If I do, I'll file a proper bug report.