Fixed some character set issues