Character encoding tweaks