Handle some unicode issues