Fixing KAT & other Provider Charmap Problem