Some bug fixing in the UTF conversions.