Fixed unicode/encoding issues