Fixed some more charset/encoding stuff.