Bugfixes including UTF-8