Misc fixes

What if you have diacritics?