Fix issues from review, and pre-emptively fix a couple of potential plString::Format issues