fixes for unicode issues