First step towards full UTF-8 support