more charset paring fixes