Add: minor improvements to UTF-8 support.