Fix charset problems 2
Cosmetic fixes in Matroska module