BTO: uf8 convertation fixes