#340 #341 #343 Fix UTF-8 issues