Templatize some more strings