HIVE-7068 Fix some string->text junk