Tweak handling of charsets