Some encoding issues fixed