Fix problems with character encoding