Fixed some encoding issues