fixes in unicode support