Some small fixes with UTF-8