Some encoding problems fixed