Fix a couple of bugs with string/text handling.