Fix charset regressions