Misc. fixes including UTF-8 names