More charset fixes