More fixes for character encodings.