More work on UTF-8 conversion