Fixed unicode encoding issues