Made some character encoding fixes