I should have a fix for this too. I ran into it as well while doing more testing.
Thanks for the detailed bug reports. If you run into any more, please post them.
