Better handling of unicode from xtf