Minor fixes and tweaks.

Nothing that should conflict with the current string/feature freeze.