Fixed a couple more bugs that popped up today. Getting the fixes to all of the correct builds is being entertaining, but -- happily! -- the fixes were fundamentally simple.

I am, however, looking forward to the weekend. :)