...And issues 1 and 2 should now be patched out!
Wow so fast! Thank you!
I happened to be working on other fixes when I saw your comment, so it worked out nicely!