Fix encoding issues due import