More charset hackery