fixes in unicode conversion