fix some unicode issues